API tools faq
paste
Guest User

Untitled

a guest
Oct 20th, 2017
87
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.71 KB | None | 0 0
raw download clone embed print report
  1. ---BEGIN CONFLICT---
  2. --BEGIN RESOLUTION--
  3. source = Eyeshield_21_v06[Ya-Ha]/Eyeshield_21_v06_c49[Ya-Ha]
  4. is_volume = false
  5. volume = 6
  6. chapter = 49
  7. order = 1
  8. special_chapter = false
  9. original_filename = false
  10. ignore = false
  11. --END RESOLUTION--
  12. --BEGIN RESOLUTION--
  13. source = Eyeshield_21_v06[Ya-Ha]/Eyeshield_21_v06_c49_color_addon_pack[Ya-Ha]
  14. is_volume = false
  15. volume = 6
  16. chapter = 49
  17. order = null
  18. special_chapter = false
  19. original_filename = false
  20. ignore = true
  21. --END RESOLUTION--
  22. --BEGIN RESOLUTION--
  23. source = Eyeshield_21_v06[Ya-Ha]/Eyeshield_21_v06_c49[Ya-Ha]/black and white pages
  24. is_volume = false
  25. volume = 6
  26. chapter = 49
  27. order = null
  28. special_chapter = false
  29. original_filename = false
  30. ignore = true
  31. --END RESOLUTION--
  32. ---END CONFLICT---
  33. ---BEGIN CONFLICT---
  34. --BEGIN RESOLUTION--
  35. source = Eyeshield_21_v23[TW_F_R_D]/Eyeshield_21_c200-202[Faizuddin][SLQ][Ryukage]/Eyeshield_21_c200/Eyeshield 21 Chapter 200 [Ryukage]
  36. is_volume = false
  37. volume = 23
  38. chapter = 200
  39. order = 1
  40. special_chapter = false
  41. original_filename = false
  42. ignore = false
  43. --END RESOLUTION--
  44. --BEGIN RESOLUTION--
  45. source = Eyeshield_21_v23[TW_F_R_D]/Eyeshield_21_c200-202[Faizuddin][SLQ][Ryukage]/Eyeshield_21_c200/Extras ;P/201[Faizuddin]
  46. is_volume = false
  47. volume = 23
  48. chapter = 200
  49. order = null
  50. special_chapter = false
  51. original_filename = false
  52. ignore = true
  53. --END RESOLUTION--
  54. --BEGIN RESOLUTION--
  55. source = Eyeshield_21_v23[TW_F_R_D]/Eyeshield_21_c200-202[Faizuddin][SLQ][Ryukage]/Eyeshield_21_c200/Extras ;P/202[Faizuddin]
  56. is_volume = false
  57. volume = 23
  58. chapter = 200
  59. order = null
  60. special_chapter = false
  61. original_filename = false
  62. ignore = true
  63. --END RESOLUTION--
  64. ---END CONFLICT---
  65. ---BEGIN CONFLICT---
  66. --BEGIN RESOLUTION--
  67. source = Eyeshield_21_v25[F_X-C_D]/Eyeshield_21_c220[Daryl]/Eyeshield 21 - 220
  68. is_volume = false
  69. volume = 25
  70. chapter = 220
  71. order = 1
  72. special_chapter = false
  73. original_filename = false
  74. ignore = false
  75. --END RESOLUTION--
  76. --BEGIN RESOLUTION--
  77. source = Eyeshield_21_v25[F_X-C_D]/Eyeshield_21_c220[Daryl]
  78. is_volume = false
  79. volume = 25
  80. chapter = 220
  81. order = null
  82. special_chapter = false
  83. original_filename = false
  84. ignore = true
  85. --END RESOLUTION--
  86. ---END CONFLICT---
  87. ---BEGIN CONFLICT---
  88. --BEGIN RESOLUTION--
  89. source = Eyeshield_21_v28[Y_M7_RS_FH]/Eyeshield 21 243 [M7]/Eyeshield 21 243 [M7]/Eyeshield 243 [M7]
  90. is_volume = false
  91. volume = 28
  92. chapter = 243
  93. order = null
  94. special_chapter = false
  95. original_filename = false
  96. ignore = false
  97. --END RESOLUTION--
  98. --BEGIN RESOLUTION--
  99. source = Eyeshield_21_v28[Y_M7_RS_FH]/ES21 244 [m7]/ES21 244 [m7]
  100. is_volume = false
  101. volume = 28
  102. chapter = 7
  103. order = null
  104. special_chapter = false
  105. original_filename = false
  106. ignore = true
  107. --END RESOLUTION--
  108. ---END CONFLICT---
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!