API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Nov 20th, 2019
145
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 81.94 KB | None | 0 0
raw download clone embed print report
  1. ➜ spinster git:(master) git merge mastodon/master
  2. Auto-merging yarn.lock
  3. CONFLICT (content): Merge conflict in yarn.lock
  4. Auto-merging streaming/index.js
  5. CONFLICT (content): Merge conflict in streaming/index.js
  6. Removing spec/workers/scheduler/subscriptions_scheduler_spec.rb
  7. Removing spec/workers/pubsubhubbub/distribution_worker_spec.rb
  8. CONFLICT (modify/delete): spec/workers/pubsubhubbub/delivery_worker_spec.rb deleted in mastodon/master and modified in HEAD. Version HEAD of spec/workers/pubsubhubbub/delivery_worker_spec.rb left in tree.
  9. Removing spec/workers/pubsubhubbub/confirmation_worker_spec.rb
  10. Removing spec/workers/after_remote_follow_worker_spec.rb
  11. Removing spec/workers/after_remote_follow_request_worker_spec.rb
  12. Auto-merging spec/services/verify_link_service_spec.rb
  13. CONFLICT (content): Merge conflict in spec/services/verify_link_service_spec.rb
  14. Removing spec/services/update_remote_profile_service_spec.rb
  15. Removing spec/services/unsubscribe_service_spec.rb
  16. Auto-merging spec/services/unblock_domain_service_spec.rb
  17. CONFLICT (content): Merge conflict in spec/services/unblock_domain_service_spec.rb
  18. CONFLICT (modify/delete): spec/services/subscribe_service_spec.rb deleted in mastodon/master and modified in HEAD. Version HEAD of spec/services/subscribe_service_spec.rb left in tree.
  19. Removing spec/services/send_interaction_service_spec.rb
  20. Auto-merging spec/services/resolve_account_service_spec.rb
  21. CONFLICT (content): Merge conflict in spec/services/resolve_account_service_spec.rb
  22. Auto-merging spec/services/reblog_service_spec.rb
  23. Removing spec/services/pubsubhubbub/unsubscribe_service_spec.rb
  24. Removing spec/services/pubsubhubbub/subscribe_service_spec.rb
  25. Auto-merging spec/services/process_mentions_service_spec.rb
  26. CONFLICT (content): Merge conflict in spec/services/process_mentions_service_spec.rb
  27. Removing spec/services/process_interaction_service_spec.rb
  28. CONFLICT (modify/delete): spec/services/process_feed_service_spec.rb deleted in mastodon/master and modified in HEAD. Version HEAD of spec/services/process_feed_service_spec.rb left in tree.
  29. Auto-merging spec/services/post_status_service_spec.rb
  30. Auto-merging spec/services/import_service_spec.rb
  31. Auto-merging spec/services/fetch_remote_account_service_spec.rb
  32. Auto-merging spec/services/bootstrap_timeline_service_spec.rb
  33. Auto-merging spec/requests/localization_spec.rb
  34. CONFLICT (modify/delete): spec/requests/link_headers_spec.rb deleted in HEAD and modified in mastodon/master. Version mastodon/master of spec/requests/link_headers_spec.rb left in tree.
  35. Auto-merging spec/rails_helper.rb
  36. CONFLICT (content): Merge conflict in spec/rails_helper.rb
  37. Removing spec/policies/subscription_policy_spec.rb
  38. Auto-merging spec/models/user_spec.rb
  39. Removing spec/models/subscription_spec.rb
  40. Removing spec/models/stream_entry_spec.rb
  41. Auto-merging spec/models/status_spec.rb
  42. CONFLICT (modify/delete): spec/models/remote_profile_spec.rb deleted in mastodon/master and modified in HEAD. Version HEAD of spec/models/remote_profile_spec.rb left in tree.
  43. Auto-merging spec/models/remote_follow_spec.rb
  44. Removing spec/models/concerns/streamable_spec.rb
  45. Auto-merging spec/models/account_spec.rb
  46. Auto-merging spec/lib/tag_manager_spec.rb
  47. CONFLICT (content): Merge conflict in spec/lib/tag_manager_spec.rb
  48. Auto-merging spec/lib/status_finder_spec.rb
  49. CONFLICT (modify/delete): spec/lib/ostatus/atom_serializer_spec.rb deleted in mastodon/master and modified in HEAD. Version HEAD of spec/lib/ostatus/atom_serializer_spec.rb left in tree.
  50. Auto-merging spec/lib/language_detector_spec.rb
  51. Auto-merging spec/lib/formatter_spec.rb
  52. Auto-merging spec/lib/feed_manager_spec.rb
  53. Auto-merging spec/lib/activitypub/tag_manager_spec.rb
  54. Auto-merging spec/lib/activitypub/activity/announce_spec.rb
  55. CONFLICT (content): Merge conflict in spec/lib/activitypub/activity/announce_spec.rb
  56. Auto-merging spec/fixtures/xml/gabsocial.atom
  57. Auto-merging spec/fixtures/requests/webfinger.txt
  58. CONFLICT (content): Merge conflict in spec/fixtures/requests/webfinger.txt
  59. Removing spec/fabricators/subscription_fabricator.rb
  60. Removing spec/fabricators/stream_entry_fabricator.rb
  61. Removing spec/controllers/stream_entries_controller_spec.rb
  62. Auto-merging spec/controllers/statuses_controller_spec.rb
  63. CONFLICT (content): Merge conflict in spec/controllers/statuses_controller_spec.rb
  64. Removing spec/controllers/remote_unfollows_controller_spec.rb
  65. Auto-merging spec/controllers/react_controller_spec.rb
  66. Auto-merging spec/controllers/application_controller_spec.rb
  67. Removing spec/controllers/api/v1/timelines/direct_controller_spec.rb
  68. Removing spec/controllers/api/v1/search_controller_spec.rb
  69. CONFLICT (modify/delete): spec/controllers/api/v1/follows_controller_spec.rb deleted in mastodon/master and modified in HEAD. Version HEAD of spec/controllers/api/v1/follows_controller_spec.rb left in tree.
  70. Auto-merging spec/controllers/api/v1/accounts/credentials_controller_spec.rb
  71. CONFLICT (modify/delete): spec/controllers/api/subscriptions_controller_spec.rb deleted in mastodon/master and modified in HEAD. Version HEAD of spec/controllers/api/subscriptions_controller_spec.rb left in tree.
  72. CONFLICT (modify/delete): spec/controllers/api/salmon_controller_spec.rb deleted in mastodon/master and modified in HEAD. Version HEAD of spec/controllers/api/salmon_controller_spec.rb left in tree.
  73. Removing spec/controllers/api/push_controller_spec.rb
  74. Auto-merging spec/controllers/api/base_controller_spec.rb
  75. Removing spec/controllers/admin/subscriptions_controller_spec.rb
  76. Auto-merging spec/controllers/accounts_controller_spec.rb
  77. CONFLICT (content): Merge conflict in spec/controllers/accounts_controller_spec.rb
  78. Auto-merging scalingo.json
  79. Auto-merging package.json
  80. CONFLICT (content): Merge conflict in package.json
  81. Auto-merging lib/tasks/repo.rake
  82. CONFLICT (content): Merge conflict in lib/tasks/repo.rake
  83. Auto-merging lib/tasks/gabsocial.rake
  84. Auto-merging lib/gabsocial/version.rb
  85. CONFLICT (content): Merge conflict in lib/gabsocial/version.rb
  86. Auto-merging lib/gabsocial/search_cli.rb
  87. CONFLICT (file location): lib/mastodon/preview_cards_cli.rb added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to lib/gabsocial/preview_cards_cli.rb.
  88. Auto-merging lib/gabsocial/media_cli.rb
  89. CONFLICT (content): Merge conflict in lib/gabsocial/media_cli.rb
  90. Auto-merging lib/gabsocial/feeds_cli.rb
  91. Auto-merging lib/gabsocial/emoji_cli.rb
  92. Auto-merging lib/gabsocial/domains_cli.rb
  93. CONFLICT (content): Merge conflict in lib/gabsocial/domains_cli.rb
  94. Auto-merging lib/gabsocial/cache_cli.rb
  95. Auto-merging lib/gabsocial/accounts_cli.rb
  96. CONFLICT (content): Merge conflict in lib/gabsocial/accounts_cli.rb
  97. Removing lib/devise/ldap_authenticatable.rb
  98. Auto-merging lib/cli.rb
  99. CONFLICT (content): Merge conflict in lib/cli.rb
  100. Auto-merging docker-compose.yml
  101. CONFLICT (content): Merge conflict in docker-compose.yml
  102. Auto-merging dist/nginx.conf
  103. Auto-merging db/seeds.rb
  104. Auto-merging db/schema.rb
  105. CONFLICT (content): Merge conflict in db/schema.rb
  106. Auto-merging db/migrate/20180528141303_fix_accounts_unique_index.rb
  107. Auto-merging db/migrate/20170918125918_ids_to_bigints.rb
  108. Auto-merging config/webpack/production.js
  109. Auto-merging config/webpack/development.js
  110. Auto-merging config/sidekiq.yml
  111. CONFLICT (content): Merge conflict in config/sidekiq.yml
  112. Auto-merging config/settings.yml
  113. CONFLICT (content): Merge conflict in config/settings.yml
  114. Auto-merging config/routes.rb
  115. CONFLICT (content): Merge conflict in config/routes.rb
  116. Auto-merging config/navigation.rb
  117. CONFLICT (content): Merge conflict in config/navigation.rb
  118. Auto-merging config/locales/zh-TW.yml
  119. CONFLICT (content): Merge conflict in config/locales/zh-TW.yml
  120. Auto-merging config/locales/zh-HK.yml
  121. CONFLICT (content): Merge conflict in config/locales/zh-HK.yml
  122. Auto-merging config/locales/zh-CN.yml
  123. CONFLICT (content): Merge conflict in config/locales/zh-CN.yml
  124. Auto-merging config/locales/uk.yml
  125. CONFLICT (content): Merge conflict in config/locales/uk.yml
  126. Auto-merging config/locales/tr.yml
  127. CONFLICT (content): Merge conflict in config/locales/tr.yml
  128. Auto-merging config/locales/th.yml
  129. CONFLICT (content): Merge conflict in config/locales/th.yml
  130. Auto-merging config/locales/te.yml
  131. Auto-merging config/locales/sv.yml
  132. CONFLICT (content): Merge conflict in config/locales/sv.yml
  133. Auto-merging config/locales/sr.yml
  134. CONFLICT (content): Merge conflict in config/locales/sr.yml
  135. Auto-merging config/locales/sr-Latn.yml
  136. CONFLICT (content): Merge conflict in config/locales/sr-Latn.yml
  137. Auto-merging config/locales/sq.yml
  138. CONFLICT (content): Merge conflict in config/locales/sq.yml
  139. Auto-merging config/locales/sl.yml
  140. CONFLICT (content): Merge conflict in config/locales/sl.yml
  141. Auto-merging config/locales/sk.yml
  142. CONFLICT (content): Merge conflict in config/locales/sk.yml
  143. Auto-merging config/locales/simple_form.zh-TW.yml
  144. CONFLICT (content): Merge conflict in config/locales/simple_form.zh-TW.yml
  145. Auto-merging config/locales/simple_form.zh-HK.yml
  146. CONFLICT (content): Merge conflict in config/locales/simple_form.zh-HK.yml
  147. Auto-merging config/locales/simple_form.zh-CN.yml
  148. CONFLICT (content): Merge conflict in config/locales/simple_form.zh-CN.yml
  149. Auto-merging config/locales/simple_form.uk.yml
  150. CONFLICT (content): Merge conflict in config/locales/simple_form.uk.yml
  151. Auto-merging config/locales/simple_form.tr.yml
  152. CONFLICT (content): Merge conflict in config/locales/simple_form.tr.yml
  153. Auto-merging config/locales/simple_form.th.yml
  154. CONFLICT (content): Merge conflict in config/locales/simple_form.th.yml
  155. Auto-merging config/locales/simple_form.sv.yml
  156. CONFLICT (content): Merge conflict in config/locales/simple_form.sv.yml
  157. Auto-merging config/locales/simple_form.sr-Latn.yml
  158. CONFLICT (content): Merge conflict in config/locales/simple_form.sr-Latn.yml
  159. Auto-merging config/locales/simple_form.sq.yml
  160. CONFLICT (content): Merge conflict in config/locales/simple_form.sq.yml
  161. Auto-merging config/locales/simple_form.sl.yml
  162. CONFLICT (content): Merge conflict in config/locales/simple_form.sl.yml
  163. Auto-merging config/locales/simple_form.sk.yml
  164. CONFLICT (content): Merge conflict in config/locales/simple_form.sk.yml
  165. Auto-merging config/locales/simple_form.ru.yml
  166. CONFLICT (content): Merge conflict in config/locales/simple_form.ru.yml
  167. Auto-merging config/locales/simple_form.pt-PT.yml
  168. CONFLICT (content): Merge conflict in config/locales/simple_form.pt-PT.yml
  169. Auto-merging config/locales/simple_form.pt-BR.yml
  170. CONFLICT (content): Merge conflict in config/locales/simple_form.pt-BR.yml
  171. Auto-merging config/locales/simple_form.pl.yml
  172. CONFLICT (content): Merge conflict in config/locales/simple_form.pl.yml
  173. Auto-merging config/locales/simple_form.oc.yml
  174. CONFLICT (content): Merge conflict in config/locales/simple_form.oc.yml
  175. Auto-merging config/locales/simple_form.no.yml
  176. CONFLICT (content): Merge conflict in config/locales/simple_form.no.yml
  177. Auto-merging config/locales/simple_form.nl.yml
  178. CONFLICT (content): Merge conflict in config/locales/simple_form.nl.yml
  179. Auto-merging config/locales/simple_form.ja.yml
  180. Auto-merging config/locales/simple_form.it.yml
  181. CONFLICT (content): Merge conflict in config/locales/simple_form.it.yml
  182. Auto-merging config/locales/simple_form.io.yml
  183. Auto-merging config/locales/simple_form.id.yml
  184. CONFLICT (content): Merge conflict in config/locales/simple_form.id.yml
  185. Auto-merging config/locales/simple_form.hu.yml
  186. CONFLICT (content): Merge conflict in config/locales/simple_form.hu.yml
  187. Auto-merging config/locales/simple_form.hr.yml
  188. Auto-merging config/locales/simple_form.gl.yml
  189. CONFLICT (content): Merge conflict in config/locales/simple_form.gl.yml
  190. Auto-merging config/locales/simple_form.fr.yml
  191. CONFLICT (content): Merge conflict in config/locales/simple_form.fr.yml
  192. Auto-merging config/locales/simple_form.fi.yml
  193. CONFLICT (content): Merge conflict in config/locales/simple_form.fi.yml
  194. Auto-merging config/locales/simple_form.eu.yml
  195. CONFLICT (content): Merge conflict in config/locales/simple_form.eu.yml
  196. Auto-merging config/locales/simple_form.es.yml
  197. CONFLICT (content): Merge conflict in config/locales/simple_form.es.yml
  198. Auto-merging config/locales/simple_form.eo.yml
  199. CONFLICT (content): Merge conflict in config/locales/simple_form.eo.yml
  200. Auto-merging config/locales/simple_form.en_GB.yml
  201. CONFLICT (content): Merge conflict in config/locales/simple_form.en_GB.yml
  202. Auto-merging config/locales/simple_form.en.yml
  203. CONFLICT (content): Merge conflict in config/locales/simple_form.en.yml
  204. Auto-merging config/locales/simple_form.el.yml
  205. CONFLICT (content): Merge conflict in config/locales/simple_form.el.yml
  206. Auto-merging config/locales/simple_form.de.yml
  207. CONFLICT (content): Merge conflict in config/locales/simple_form.de.yml
  208. Auto-merging config/locales/simple_form.da.yml
  209. CONFLICT (content): Merge conflict in config/locales/simple_form.da.yml
  210. Auto-merging config/locales/simple_form.cy.yml
  211. CONFLICT (content): Merge conflict in config/locales/simple_form.cy.yml
  212. Auto-merging config/locales/simple_form.cs.yml
  213. CONFLICT (content): Merge conflict in config/locales/simple_form.cs.yml
  214. Auto-merging config/locales/simple_form.co.yml
  215. CONFLICT (content): Merge conflict in config/locales/simple_form.co.yml
  216. Auto-merging config/locales/simple_form.ca.yml
  217. CONFLICT (content): Merge conflict in config/locales/simple_form.ca.yml
  218. Auto-merging config/locales/simple_form.bg.yml
  219. Auto-merging config/locales/simple_form.ast.yml
  220. CONFLICT (content): Merge conflict in config/locales/simple_form.ast.yml
  221. Auto-merging config/locales/ru.yml
  222. CONFLICT (content): Merge conflict in config/locales/ru.yml
  223. Auto-merging config/locales/ro.yml
  224. CONFLICT (content): Merge conflict in config/locales/ro.yml
  225. Auto-merging config/locales/pt-PT.yml
  226. CONFLICT (content): Merge conflict in config/locales/pt-PT.yml
  227. Auto-merging config/locales/pt-BR.yml
  228. CONFLICT (content): Merge conflict in config/locales/pt-BR.yml
  229. Auto-merging config/locales/pl.yml
  230. CONFLICT (content): Merge conflict in config/locales/pl.yml
  231. Auto-merging config/locales/oc.yml
  232. CONFLICT (content): Merge conflict in config/locales/oc.yml
  233. Auto-merging config/locales/no.yml
  234. CONFLICT (content): Merge conflict in config/locales/no.yml
  235. Auto-merging config/locales/nl.yml
  236. CONFLICT (content): Merge conflict in config/locales/nl.yml
  237. Auto-merging config/locales/ms.yml
  238. CONFLICT (content): Merge conflict in config/locales/ms.yml
  239. Auto-merging config/locales/lt.yml
  240. CONFLICT (content): Merge conflict in config/locales/lt.yml
  241. Auto-merging config/locales/ko.yml
  242. CONFLICT (content): Merge conflict in config/locales/ko.yml
  243. Auto-merging config/locales/kk.yml
  244. CONFLICT (content): Merge conflict in config/locales/kk.yml
  245. Auto-merging config/locales/ka.yml
  246. CONFLICT (content): Merge conflict in config/locales/ka.yml
  247. Auto-merging config/locales/ja.yml
  248. CONFLICT (content): Merge conflict in config/locales/ja.yml
  249. Auto-merging config/locales/it.yml
  250. CONFLICT (content): Merge conflict in config/locales/it.yml
  251. Auto-merging config/locales/io.yml
  252. Auto-merging config/locales/id.yml
  253. CONFLICT (content): Merge conflict in config/locales/id.yml
  254. Auto-merging config/locales/hu.yml
  255. CONFLICT (content): Merge conflict in config/locales/hu.yml
  256. Auto-merging config/locales/hr.yml
  257. CONFLICT (content): Merge conflict in config/locales/hr.yml
  258. Auto-merging config/locales/he.yml
  259. CONFLICT (content): Merge conflict in config/locales/he.yml
  260. Auto-merging config/locales/gl.yml
  261. CONFLICT (content): Merge conflict in config/locales/gl.yml
  262. Auto-merging config/locales/fr.yml
  263. CONFLICT (content): Merge conflict in config/locales/fr.yml
  264. Auto-merging config/locales/fi.yml
  265. CONFLICT (content): Merge conflict in config/locales/fi.yml
  266. Auto-merging config/locales/fa.yml
  267. CONFLICT (content): Merge conflict in config/locales/fa.yml
  268. Auto-merging config/locales/eu.yml
  269. CONFLICT (content): Merge conflict in config/locales/eu.yml
  270. Auto-merging config/locales/es.yml
  271. CONFLICT (content): Merge conflict in config/locales/es.yml
  272. Auto-merging config/locales/eo.yml
  273. CONFLICT (content): Merge conflict in config/locales/eo.yml
  274. Auto-merging config/locales/en_GB.yml
  275. Auto-merging config/locales/en.yml
  276. CONFLICT (content): Merge conflict in config/locales/en.yml
  277. Auto-merging config/locales/el.yml
  278. CONFLICT (content): Merge conflict in config/locales/el.yml
  279. Auto-merging config/locales/doorkeeper.en.yml
  280. CONFLICT (content): Merge conflict in config/locales/doorkeeper.en.yml
  281. Auto-merging config/locales/devise.zh-TW.yml
  282. Auto-merging config/locales/devise.zh-HK.yml
  283. Auto-merging config/locales/devise.zh-CN.yml
  284. CONFLICT (content): Merge conflict in config/locales/devise.zh-CN.yml
  285. Auto-merging config/locales/devise.uk.yml
  286. CONFLICT (content): Merge conflict in config/locales/devise.uk.yml
  287. Auto-merging config/locales/devise.th.yml
  288. CONFLICT (content): Merge conflict in config/locales/devise.th.yml
  289. Auto-merging config/locales/devise.sr.yml
  290. Auto-merging config/locales/devise.sr-Latn.yml
  291. Auto-merging config/locales/devise.sl.yml
  292. CONFLICT (content): Merge conflict in config/locales/devise.sl.yml
  293. Auto-merging config/locales/devise.sk.yml
  294. CONFLICT (content): Merge conflict in config/locales/devise.sk.yml
  295. Auto-merging config/locales/devise.ru.yml
  296. Auto-merging config/locales/devise.pt-PT.yml
  297. Auto-merging config/locales/devise.pt-BR.yml
  298. Auto-merging config/locales/devise.oc.yml
  299. Auto-merging config/locales/devise.no.yml
  300. Auto-merging config/locales/devise.nl.yml
  301. Auto-merging config/locales/devise.ko.yml
  302. CONFLICT (content): Merge conflict in config/locales/devise.ko.yml
  303. Auto-merging config/locales/devise.kk.yml
  304. CONFLICT (content): Merge conflict in config/locales/devise.kk.yml
  305. Auto-merging config/locales/devise.ja.yml
  306. CONFLICT (content): Merge conflict in config/locales/devise.ja.yml
  307. Auto-merging config/locales/devise.it.yml
  308. CONFLICT (content): Merge conflict in config/locales/devise.it.yml
  309. Auto-merging config/locales/devise.id.yml
  310. CONFLICT (content): Merge conflict in config/locales/devise.id.yml
  311. Auto-merging config/locales/devise.hu.yml
  312. CONFLICT (content): Merge conflict in config/locales/devise.hu.yml
  313. Auto-merging config/locales/devise.hr.yml
  314. Auto-merging config/locales/devise.gl.yml
  315. Auto-merging config/locales/devise.fr.yml
  316. CONFLICT (content): Merge conflict in config/locales/devise.fr.yml
  317. Auto-merging config/locales/devise.fi.yml
  318. CONFLICT (content): Merge conflict in config/locales/devise.fi.yml
  319. Auto-merging config/locales/devise.fa.yml
  320. Auto-merging config/locales/devise.eu.yml
  321. CONFLICT (content): Merge conflict in config/locales/devise.eu.yml
  322. Auto-merging config/locales/devise.es.yml
  323. CONFLICT (content): Merge conflict in config/locales/devise.es.yml
  324. Auto-merging config/locales/devise.eo.yml
  325. CONFLICT (content): Merge conflict in config/locales/devise.eo.yml
  326. Auto-merging config/locales/devise.en.yml
  327. CONFLICT (content): Merge conflict in config/locales/devise.en.yml
  328. Auto-merging config/locales/devise.el.yml
  329. Auto-merging config/locales/devise.de.yml
  330. Auto-merging config/locales/devise.da.yml
  331. CONFLICT (content): Merge conflict in config/locales/devise.da.yml
  332. Auto-merging config/locales/devise.cy.yml
  333. CONFLICT (content): Merge conflict in config/locales/devise.cy.yml
  334. Auto-merging config/locales/devise.cs.yml
  335. CONFLICT (content): Merge conflict in config/locales/devise.cs.yml
  336. Auto-merging config/locales/devise.co.yml
  337. Auto-merging config/locales/devise.ca.yml
  338. Auto-merging config/locales/devise.ar.yml
  339. CONFLICT (content): Merge conflict in config/locales/devise.ar.yml
  340. Auto-merging config/locales/de.yml
  341. CONFLICT (content): Merge conflict in config/locales/de.yml
  342. Auto-merging config/locales/da.yml
  343. CONFLICT (content): Merge conflict in config/locales/da.yml
  344. Auto-merging config/locales/cy.yml
  345. CONFLICT (content): Merge conflict in config/locales/cy.yml
  346. Auto-merging config/locales/cs.yml
  347. CONFLICT (content): Merge conflict in config/locales/cs.yml
  348. Auto-merging config/locales/co.yml
  349. CONFLICT (content): Merge conflict in config/locales/co.yml
  350. Auto-merging config/locales/ca.yml
  351. CONFLICT (content): Merge conflict in config/locales/ca.yml
  352. Auto-merging config/locales/bn.yml
  353. Auto-merging config/locales/bg.yml
  354. Auto-merging config/locales/ast.yml
  355. CONFLICT (content): Merge conflict in config/locales/ast.yml
  356. Auto-merging config/locales/ar.yml
  357. CONFLICT (content): Merge conflict in config/locales/ar.yml
  358. Auto-merging config/initializers/statsd.rb
  359. CONFLICT (content): Merge conflict in config/initializers/statsd.rb
  360. Auto-merging config/initializers/rack_attack.rb
  361. CONFLICT (content): Merge conflict in config/initializers/rack_attack.rb
  362. Removing config/initializers/instrumentation.rb
  363. Auto-merging config/initializers/content_security_policy.rb
  364. CONFLICT (content): Merge conflict in config/initializers/content_security_policy.rb
  365. Auto-merging config/environments/production.rb
  366. Auto-merging config/deploy.rb
  367. Auto-merging config/application.rb
  368. CONFLICT (content): Merge conflict in config/application.rb
  369. Auto-merging boxfile.yml
  370. CONFLICT (content): Merge conflict in boxfile.yml
  371. Auto-merging app/workers/unfollow_follow_worker.rb
  372. CONFLICT (content): Merge conflict in app/workers/unfollow_follow_worker.rb
  373. Auto-merging app/workers/pubsubhubbub/delivery_worker.rb
  374. CONFLICT (content): Merge conflict in app/workers/pubsubhubbub/delivery_worker.rb
  375. Removing app/workers/maintenance/uncache_media_worker.rb
  376. Removing app/workers/maintenance/redownload_account_media_worker.rb
  377. Removing app/workers/maintenance/destroy_media_worker.rb
  378. Auto-merging app/workers/activitypub/delivery_worker.rb
  379. CONFLICT (content): Merge conflict in app/workers/activitypub/delivery_worker.rb
  380. Removing app/views/well_known/webfinger/show.xml.ruby
  381. Auto-merging app/views/user_mailer/warning.html.haml
  382. Auto-merging app/views/tags/show.html.haml
  383. CONFLICT (content): Merge conflict in app/views/tags/show.html.haml
  384. CONFLICT (modify/delete): app/views/stream_entries/show.html.haml deleted in mastodon/master and modified in HEAD. Version HEAD of app/views/stream_entries/show.html.haml left in tree.
  385. Removing app/views/stream_entries/embed.html.haml
  386. Auto-merging app/views/statuses/_og_image.html.haml
  387. CONFLICT (file location): app/views/stream_entries/_meta.html.haml added in HEAD inside a directory that was renamed in mastodon/master, suggesting it should perhaps be moved to app/views/statuses/_meta.html.haml.
  388. Auto-merging app/views/statuses/_detailed_status.html.haml
  389. Auto-merging app/views/shares/show.html.haml
  390. Auto-merging app/views/shared/_og.html.haml
  391. CONFLICT (content): Merge conflict in app/views/shared/_og.html.haml
  392. Auto-merging app/views/settings/profiles/show.html.haml
  393. CONFLICT (content): Merge conflict in app/views/settings/profiles/show.html.haml
  394. CONFLICT (modify/delete): app/views/settings/preferences/show.html.haml deleted in mastodon/master and modified in HEAD. Version HEAD of app/views/settings/preferences/show.html.haml left in tree.
  395. Auto-merging app/views/settings/preferences/notifications/show.html.haml
  396. CONFLICT (content): Merge conflict in app/views/settings/preferences/notifications/show.html.haml
  397. Removing app/views/remote_unfollows/success.html.haml
  398. Removing app/views/remote_unfollows/error.html.haml
  399. Removing app/views/remote_unfollows/_post_follow_actions.html.haml
  400. Removing app/views/remote_unfollows/_card.html.haml
  401. Auto-merging app/views/react/react.html.haml
  402. Auto-merging app/views/public_timelines/show.html.haml
  403. Auto-merging app/views/layouts/public.html.haml
  404. CONFLICT (content): Merge conflict in app/views/layouts/public.html.haml
  405. Auto-merging app/views/layouts/mailer.html.haml
  406. Auto-merging app/views/layouts/auth.html.haml
  407. CONFLICT (content): Merge conflict in app/views/layouts/auth.html.haml
  408. Auto-merging app/views/layouts/application.html.haml
  409. CONFLICT (content): Merge conflict in app/views/layouts/application.html.haml
  410. Auto-merging app/views/layouts/admin.html.haml
  411. CONFLICT (content): Merge conflict in app/views/layouts/admin.html.haml
  412. Auto-merging app/views/directories/index.html.haml
  413. Auto-merging app/views/auth/registrations/new.html.haml
  414. CONFLICT (content): Merge conflict in app/views/auth/registrations/new.html.haml
  415. Auto-merging app/views/auth/registrations/_sessions.html.haml
  416. Removing app/views/auth/confirmations/finish_signup.html.haml
  417. Auto-merging app/views/application/_login.html.haml
  418. Removing app/views/admin/subscriptions/index.html.haml
  419. Removing app/views/admin/subscriptions/_subscription.html.haml
  420. Auto-merging app/views/admin/settings/edit.html.haml
  421. Auto-merging app/views/admin/reports/show.html.haml
  422. Auto-merging app/views/admin/pending_accounts/_account.html.haml
  423. Auto-merging app/views/admin/domain_blocks/show.html.haml
  424. Auto-merging app/views/admin/dashboard/index.html.haml
  425. CONFLICT (content): Merge conflict in app/views/admin/dashboard/index.html.haml
  426. Auto-merging app/views/admin/accounts/show.html.haml
  427. Auto-merging app/views/admin/account_actions/new.html.haml
  428. Auto-merging app/views/accounts/show.html.haml
  429. CONFLICT (content): Merge conflict in app/views/accounts/show.html.haml
  430. Auto-merging app/views/about/show.html.haml
  431. CONFLICT (content): Merge conflict in app/views/about/show.html.haml
  432. Auto-merging app/views/about/more.html.haml
  433. CONFLICT (content): Merge conflict in app/views/about/more.html.haml
  434. Auto-merging app/views/about/_registration.html.haml
  435. Removing app/services/verify_salmon_service.rb
  436. Removing app/services/update_remote_profile_service.rb
  437. Auto-merging app/services/update_account_service.rb
  438. Removing app/services/unsubscribe_service.rb
  439. Auto-merging app/services/unblock_domain_service.rb
  440. CONFLICT (content): Merge conflict in app/services/unblock_domain_service.rb
  441. Auto-merging app/services/suspend_account_service.rb
  442. CONFLICT (modify/delete): app/services/subscribe_service.rb deleted in mastodon/master and modified in HEAD. Version HEAD of app/services/subscribe_service.rb left in tree.
  443. CONFLICT (modify/delete): app/services/send_interaction_service.rb deleted in mastodon/master and modified in HEAD. Version HEAD of app/services/send_interaction_service.rb left in tree.
  444. Auto-merging app/services/resolve_url_service.rb
  445. CONFLICT (content): Merge conflict in app/services/resolve_url_service.rb
  446. Auto-merging app/services/resolve_account_service.rb
  447. CONFLICT (content): Merge conflict in app/services/resolve_account_service.rb
  448. Auto-merging app/services/remove_status_service.rb
  449. Auto-merging app/services/reblog_service.rb
  450. CONFLICT (content): Merge conflict in app/services/reblog_service.rb
  451. Removing app/services/pubsubhubbub/unsubscribe_service.rb
  452. Removing app/services/pubsubhubbub/subscribe_service.rb
  453. Auto-merging app/services/process_mentions_service.rb
  454. CONFLICT (modify/delete): app/services/process_interaction_service.rb deleted in mastodon/master and modified in HEAD. Version HEAD of app/services/process_interaction_service.rb left in tree.
  455. Removing app/services/process_feed_service.rb
  456. Auto-merging app/services/post_status_service.rb
  457. CONFLICT (content): Merge conflict in app/services/post_status_service.rb
  458. Auto-merging app/services/follow_service.rb
  459. CONFLICT (content): Merge conflict in app/services/follow_service.rb
  460. Auto-merging app/services/fetch_link_card_service.rb
  461. CONFLICT (content): Merge conflict in app/services/fetch_link_card_service.rb
  462. Removing app/services/fetch_atom_service.rb
  463. Auto-merging app/services/fan_out_on_write_service.rb
  464. Removing app/services/concerns/stream_entry_renderer.rb
  465. Removing app/services/concerns/author_extractor.rb
  466. Auto-merging app/services/bootstrap_timeline_service.rb
  467. Auto-merging app/services/block_domain_service.rb
  468. CONFLICT (content): Merge conflict in app/services/block_domain_service.rb
  469. Auto-merging app/services/activitypub/process_account_service.rb
  470. CONFLICT (content): Merge conflict in app/services/activitypub/process_account_service.rb
  471. Auto-merging app/serializers/rss/tag_serializer.rb
  472. Auto-merging app/serializers/rss/account_serializer.rb
  473. CONFLICT (content): Merge conflict in app/serializers/rss/account_serializer.rb
  474. Removing app/serializers/rest/v2/search_serializer.rb
  475. Auto-merging app/serializers/rest/status_serializer.rb
  476. Auto-merging app/serializers/rest/instance_serializer.rb
  477. CONFLICT (content): Merge conflict in app/serializers/rest/instance_serializer.rb
  478. Auto-merging app/serializers/rest/account_serializer.rb
  479. CONFLICT (content): Merge conflict in app/serializers/rest/account_serializer.rb
  480. Auto-merging app/serializers/manifest_serializer.rb
  481. Auto-merging app/serializers/initial_state_serializer.rb
  482. CONFLICT (content): Merge conflict in app/serializers/initial_state_serializer.rb
  483. Auto-merging app/serializers/activitypub/activity_serializer.rb
  484. Auto-merging app/presenters/instance_presenter.rb
  485. Removing app/policies/subscription_policy.rb
  486. Auto-merging app/models/user.rb
  487. CONFLICT (content): Merge conflict in app/models/user.rb
  488. Auto-merging app/models/trending_tags.rb
  489. CONFLICT (content): Merge conflict in app/models/trending_tags.rb
  490. Removing app/models/subscription.rb
  491. Removing app/models/stream_entry.rb
  492. Auto-merging app/models/status.rb
  493. CONFLICT (content): Merge conflict in app/models/status.rb
  494. Removing app/models/remote_profile.rb
  495. Auto-merging app/models/relay.rb
  496. CONFLICT (content): Merge conflict in app/models/relay.rb
  497. Auto-merging app/models/form/status_batch.rb
  498. CONFLICT (content): Merge conflict in app/models/form/status_batch.rb
  499. Removing app/models/form/migration.rb
  500. Auto-merging app/models/form/admin_settings.rb
  501. CONFLICT (content): Merge conflict in app/models/form/admin_settings.rb
  502. Auto-merging app/models/domain_block.rb
  503. CONFLICT (content): Merge conflict in app/models/domain_block.rb
  504. Removing app/models/concerns/streamable.rb
  505. Auto-merging app/models/concerns/remotable.rb
  506. CONFLICT (content): Merge conflict in app/models/concerns/remotable.rb
  507. Auto-merging app/models/concerns/attachmentable.rb
  508. CONFLICT (content): Merge conflict in app/models/concerns/attachmentable.rb
  509. Auto-merging app/models/concerns/account_finder_concern.rb
  510. CONFLICT (content): Merge conflict in app/models/concerns/account_finder_concern.rb
  511. Auto-merging app/models/concerns/account_associations.rb
  512. Auto-merging app/models/account.rb
  513. CONFLICT (content): Merge conflict in app/models/account.rb
  514. Auto-merging app/mailers/user_mailer.rb
  515. Auto-merging app/mailers/admin_mailer.rb
  516. CONFLICT (content): Merge conflict in app/mailers/admin_mailer.rb
  517. Auto-merging app/lib/user_settings_decorator.rb
  518. CONFLICT (content): Merge conflict in app/lib/user_settings_decorator.rb
  519. Auto-merging app/lib/sidekiq_error_handler.rb
  520. CONFLICT (content): Merge conflict in app/lib/sidekiq_error_handler.rb
  521. Auto-merging app/lib/sanitize_config.rb
  522. CONFLICT (content): Merge conflict in app/lib/sanitize_config.rb
  523. Auto-merging app/lib/request.rb
  524. CONFLICT (content): Merge conflict in app/lib/request.rb
  525. CONFLICT (modify/delete): app/lib/ostatus/atom_serializer.rb deleted in mastodon/master and modified in HEAD. Version HEAD of app/lib/ostatus/atom_serializer.rb left in tree.
  526. Removing app/lib/ostatus/activity/share.rb
  527. Removing app/lib/ostatus/activity/remote.rb
  528. Removing app/lib/ostatus/activity/post.rb
  529. Removing app/lib/ostatus/activity/general.rb
  530. Removing app/lib/ostatus/activity/deletion.rb
  531. CONFLICT (modify/delete): app/lib/ostatus/activity/creation.rb deleted in mastodon/master and modified in HEAD. Version HEAD of app/lib/ostatus/activity/creation.rb left in tree.
  532. Removing app/lib/ostatus/activity/base.rb
  533. Auto-merging app/lib/formatter.rb
  534. Auto-merging app/lib/feed_manager.rb
  535. Auto-merging app/lib/activitypub/tag_manager.rb
  536. Auto-merging app/lib/activitypub/activity/create.rb
  537. CONFLICT (content): Merge conflict in app/lib/activitypub/activity/create.rb
  538. Auto-merging app/lib/activitypub/activity.rb
  539. CONFLICT (modify/delete): app/javascript/styles/mastodon/variables.scss deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/styles/mastodon/variables.scss left in tree.
  540. CONFLICT (modify/delete): app/javascript/styles/mastodon/footer.scss deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/styles/mastodon/footer.scss left in tree.
  541. CONFLICT (modify/delete): app/javascript/styles/mastodon/components.scss deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/styles/mastodon/components.scss left in tree.
  542. CONFLICT (modify/delete): app/javascript/styles/mastodon/_mixins.scss deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/styles/mastodon/_mixins.scss left in tree.
  543. Auto-merging app/javascript/styles/mailer.scss
  544. Auto-merging app/javascript/styles/gabsocial/widgets.scss
  545. Auto-merging app/javascript/styles/gabsocial/tables.scss
  546. CONFLICT (file location): app/javascript/styles/mastodon/stream_entries.scss renamed to app/javascript/styles/mastodon/statuses.scss in mastodon/master, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/styles/gabsocial/statuses.scss.
  547. CONFLICT (rename/rename): Rename "app/javascript/styles/mastodon/stream_entries.scss"->"app/javascript/styles/gabsocial/stream_entries.scss" in branch "HEAD" rename "app/javascript/styles/mastodon/stream_entries.scss"->"app/javascript/styles/gabsocial/statuses.scss" in "mastodon/master"
  548. Auto-merging app/javascript/styles/gabsocial/stream_entries.scss and app/javascript/styles/gabsocial/statuses.scss, both renamed from app/javascript/styles/mastodon/stream_entries.scss
  549. Auto-merging app/javascript/styles/gabsocial/rtl.scss
  550. Auto-merging app/javascript/styles/gabsocial/polls.scss
  551. CONFLICT (content): Merge conflict in app/javascript/styles/gabsocial/polls.scss
  552. Auto-merging app/javascript/styles/gabsocial/introduction.scss
  553. CONFLICT (content): Merge conflict in app/javascript/styles/gabsocial/introduction.scss
  554. Auto-merging app/javascript/styles/gabsocial/forms.scss
  555. Auto-merging app/javascript/styles/gabsocial/dashboard.scss
  556. Auto-merging app/javascript/styles/gabsocial/containers.scss
  557. Auto-merging app/javascript/styles/gabsocial/basics.scss
  558. CONFLICT (content): Merge conflict in app/javascript/styles/gabsocial/basics.scss
  559. Auto-merging app/javascript/styles/gabsocial/admin.scss
  560. CONFLICT (content): Merge conflict in app/javascript/styles/gabsocial/admin.scss
  561. Auto-merging app/javascript/styles/gabsocial/accounts.scss
  562. Auto-merging app/javascript/styles/gabsocial/about.scss
  563. CONFLICT (content): Merge conflict in app/javascript/styles/gabsocial/about.scss
  564. Auto-merging app/javascript/styles/gabsocial-light/variables.scss
  565. CONFLICT (content): Merge conflict in app/javascript/styles/gabsocial-light/variables.scss
  566. Auto-merging app/javascript/styles/gabsocial-light/diff.scss
  567. CONFLICT (content): Merge conflict in app/javascript/styles/gabsocial-light/diff.scss
  568. Auto-merging app/javascript/styles/contrast/diff.scss
  569. Auto-merging app/javascript/styles/application.scss
  570. CONFLICT (content): Merge conflict in app/javascript/styles/application.scss
  571. Auto-merging app/javascript/packs/public.js
  572. CONFLICT (content): Merge conflict in app/javascript/packs/public.js
  573. Auto-merging app/javascript/packs/admin.js
  574. CONFLICT (modify/delete): app/javascript/mastodon/scroll.js deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/mastodon/scroll.js left in tree.
  575. CONFLICT (modify/delete): app/javascript/mastodon/locales/sl.json deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/mastodon/locales/sl.json left in tree.
  576. CONFLICT (modify/delete): app/javascript/mastodon/locales/hu.json deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/mastodon/locales/hu.json left in tree.
  577. CONFLICT (modify/delete): app/javascript/mastodon/features/ui/components/tabs_bar.js deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/mastodon/features/ui/components/tabs_bar.js left in tree.
  578. CONFLICT (modify/delete): app/javascript/mastodon/features/ui/components/columns_area.js deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/mastodon/features/ui/components/columns_area.js left in tree.
  579. CONFLICT (modify/delete): app/javascript/mastodon/features/public_timeline/index.js deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/mastodon/features/public_timeline/index.js left in tree.
  580. CONFLICT (modify/delete): app/javascript/mastodon/features/keyboard_shortcuts/index.js deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/mastodon/features/keyboard_shortcuts/index.js left in tree.
  581. CONFLICT (modify/delete): app/javascript/mastodon/features/hashtag_timeline/containers/column_settings_container.js deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/mastodon/features/hashtag_timeline/containers/column_settings_container.js left in tree.
  582. CONFLICT (modify/delete): app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js left in tree.
  583. CONFLICT (modify/delete): app/javascript/mastodon/features/following/index.js deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/mastodon/features/following/index.js left in tree.
  584. CONFLICT (modify/delete): app/javascript/mastodon/features/followers/index.js deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/mastodon/features/followers/index.js left in tree.
  585. CONFLICT (modify/delete): app/javascript/mastodon/features/favourited_statuses/index.js deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/mastodon/features/favourited_statuses/index.js left in tree.
  586. CONFLICT (modify/delete): app/javascript/mastodon/features/community_timeline/index.js deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/mastodon/features/community_timeline/index.js left in tree.
  587. CONFLICT (modify/delete): app/javascript/mastodon/features/account_timeline/index.js deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/mastodon/features/account_timeline/index.js left in tree.
  588. CONFLICT (modify/delete): app/javascript/mastodon/features/account_gallery/index.js deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/mastodon/features/account_gallery/index.js left in tree.
  589. CONFLICT (modify/delete): app/javascript/mastodon/components/media_gallery.js deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/mastodon/components/media_gallery.js left in tree.
  590. CONFLICT (modify/delete): app/javascript/mastodon/components/column.js deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/javascript/mastodon/components/column.js left in tree.
  591. Auto-merging app/javascript/images/logo_transparent.svg
  592. CONFLICT (content): Merge conflict in app/javascript/images/logo_transparent.svg
  593. CONFLICT (file location): app/javascript/mastodon/utils/scrollbar.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/utils/scrollbar.js.
  594. Auto-merging app/javascript/gabsocial/utils/numbers.js
  595. CONFLICT (content): Merge conflict in app/javascript/gabsocial/utils/numbers.js
  596. CONFLICT (file location): app/javascript/mastodon/utils/log_out.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/utils/log_out.js.
  597. Auto-merging app/javascript/gabsocial/stream.js
  598. Auto-merging app/javascript/gabsocial/selectors/index.js
  599. CONFLICT (content): Merge conflict in app/javascript/gabsocial/selectors/index.js
  600. Auto-merging app/javascript/gabsocial/rtl.js
  601. Auto-merging app/javascript/gabsocial/reducers/user_lists.js
  602. CONFLICT (content): Merge conflict in app/javascript/gabsocial/reducers/user_lists.js
  603. CONFLICT (file location): app/javascript/mastodon/reducers/trends.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/reducers/trends.js.
  604. Auto-merging app/javascript/gabsocial/reducers/timelines.js
  605. CONFLICT (content): Merge conflict in app/javascript/gabsocial/reducers/timelines.js
  606. Auto-merging app/javascript/gabsocial/reducers/settings.js
  607. Auto-merging app/javascript/gabsocial/reducers/search.js
  608. Auto-merging app/javascript/gabsocial/reducers/notifications.js
  609. CONFLICT (content): Merge conflict in app/javascript/gabsocial/reducers/notifications.js
  610. CONFLICT (file location): app/javascript/mastodon/reducers/missed_updates.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/reducers/missed_updates.js.
  611. Auto-merging app/javascript/gabsocial/reducers/index.js
  612. CONFLICT (content): Merge conflict in app/javascript/gabsocial/reducers/index.js
  613. Auto-merging app/javascript/gabsocial/reducers/compose.js
  614. CONFLICT (file location): app/javascript/mastodon/reducers/blocks.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/reducers/blocks.js.
  615. Auto-merging app/javascript/gabsocial/locales/zh-TW.json
  616. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/zh-TW.json
  617. Auto-merging app/javascript/gabsocial/locales/zh-HK.json
  618. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/zh-HK.json
  619. Auto-merging app/javascript/gabsocial/locales/zh-CN.json
  620. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/zh-CN.json
  621. CONFLICT (file location): app/javascript/mastodon/locales/whitelist_ur.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/whitelist_ur.json.
  622. CONFLICT (file location): app/javascript/mastodon/locales/whitelist_pt-PT.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/whitelist_pt-PT.json.
  623. CONFLICT (file location): app/javascript/mastodon/locales/whitelist_nn.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/whitelist_nn.json.
  624. CONFLICT (rename/rename): Rename app/javascript/mastodon/locales/whitelist_ru.json->app/javascript/gabsocial/locales/whitelist_nn.json in HEAD. Rename app/javascript/mastodon/locales/whitelist_nn.json->app/javascript/gabsocial/locales/whitelist_nn.json in mastodon/master
  625. Auto-merging app/javascript/gabsocial/locales/whitelist_nn.json
  626. CONFLICT (file location): app/javascript/mastodon/locales/whitelist_pt.json renamed to app/javascript/mastodon/locales/whitelist_br.json in mastodon/master, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/whitelist_br.json.
  627. CONFLICT (rename/rename): Rename "app/javascript/mastodon/locales/whitelist_pt.json"->"app/javascript/gabsocial/locales/whitelist_ms.json" in branch "HEAD" rename "app/javascript/mastodon/locales/whitelist_pt.json"->"app/javascript/gabsocial/locales/whitelist_br.json" in "mastodon/master"
  628. Auto-merging app/javascript/gabsocial/locales/whitelist_br.json
  629. CONFLICT (file location): app/javascript/mastodon/locales/whitelist_mr.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/whitelist_mr.json.
  630. CONFLICT (file location): app/javascript/mastodon/locales/whitelist_ml.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/whitelist_ml.json.
  631. CONFLICT (file location): app/javascript/mastodon/locales/whitelist_mk.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/whitelist_mk.json.
  632. CONFLICT (rename/rename): Rename app/javascript/mastodon/locales/whitelist_pt-BR.json->app/javascript/gabsocial/locales/whitelist_mk.json in HEAD. Rename app/javascript/mastodon/locales/whitelist_mk.json->app/javascript/gabsocial/locales/whitelist_mk.json in mastodon/master
  633. Auto-merging app/javascript/gabsocial/locales/whitelist_mk.json
  634. CONFLICT (file location): app/javascript/mastodon/locales/whitelist_lt.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/whitelist_lt.json.
  635. CONFLICT (rename/rename): Rename app/javascript/mastodon/locales/whitelist_oc.json->app/javascript/gabsocial/locales/whitelist_lt.json in HEAD. Rename app/javascript/mastodon/locales/whitelist_lt.json->app/javascript/gabsocial/locales/whitelist_lt.json in mastodon/master
  636. Auto-merging app/javascript/gabsocial/locales/whitelist_lt.json
  637. CONFLICT (file location): app/javascript/mastodon/locales/whitelist_kn.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/whitelist_kn.json.
  638. CONFLICT (file location): app/javascript/mastodon/locales/whitelist_ga.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/whitelist_ga.json.
  639. CONFLICT (rename/rename): Rename app/javascript/mastodon/locales/whitelist_hr.json->app/javascript/gabsocial/locales/whitelist_ga.json in HEAD. Rename app/javascript/mastodon/locales/whitelist_ga.json->app/javascript/gabsocial/locales/whitelist_ga.json in mastodon/master
  640. Auto-merging app/javascript/gabsocial/locales/whitelist_ga.json
  641. CONFLICT (file location): app/javascript/mastodon/locales/whitelist_et.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/whitelist_et.json.
  642. CONFLICT (rename/rename): Rename app/javascript/mastodon/locales/whitelist_fi.json->app/javascript/gabsocial/locales/whitelist_et.json in HEAD. Rename app/javascript/mastodon/locales/whitelist_et.json->app/javascript/gabsocial/locales/whitelist_et.json in mastodon/master
  643. Auto-merging app/javascript/gabsocial/locales/whitelist_et.json
  644. CONFLICT (file location): app/javascript/mastodon/locales/whitelist_es-AR.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/whitelist_es-AR.json.
  645. CONFLICT (rename/rename): Rename app/javascript/mastodon/locales/whitelist_eu.json->app/javascript/gabsocial/locales/whitelist_es-AR.json in HEAD. Rename app/javascript/mastodon/locales/whitelist_es-AR.json->app/javascript/gabsocial/locales/whitelist_es-AR.json in mastodon/master
  646. Auto-merging app/javascript/gabsocial/locales/whitelist_es-AR.json
  647. CONFLICT (file location): app/javascript/mastodon/locales/ur.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/ur.json.
  648. Auto-merging app/javascript/gabsocial/locales/uk.json
  649. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/uk.json
  650. Auto-merging app/javascript/gabsocial/locales/tr.json
  651. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/tr.json
  652. Auto-merging app/javascript/gabsocial/locales/th.json
  653. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/th.json
  654. Auto-merging app/javascript/gabsocial/locales/te.json
  655. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/te.json
  656. Auto-merging app/javascript/gabsocial/locales/sv.json
  657. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/sv.json
  658. Auto-merging app/javascript/gabsocial/locales/sr.json
  659. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/sr.json
  660. Auto-merging app/javascript/gabsocial/locales/sr-Latn.json
  661. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/sr-Latn.json
  662. Auto-merging app/javascript/gabsocial/locales/sq.json
  663. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/sq.json
  664. Auto-merging app/javascript/gabsocial/locales/sk.json
  665. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/sk.json
  666. Auto-merging app/javascript/gabsocial/locales/ru.json
  667. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/ru.json
  668. Auto-merging app/javascript/gabsocial/locales/ro.json
  669. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/ro.json
  670. CONFLICT (file location): app/javascript/mastodon/locales/pt.json renamed to app/javascript/mastodon/locales/pt-PT.json in mastodon/master, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/pt-PT.json.
  671. CONFLICT (rename/rename): Rename "app/javascript/mastodon/locales/pt.json"->"app/javascript/gabsocial/locales/pt.json" in branch "HEAD" rename "app/javascript/mastodon/locales/pt.json"->"app/javascript/gabsocial/locales/pt-PT.json" in "mastodon/master"
  672. Auto-merging app/javascript/gabsocial/locales/pt.json and app/javascript/gabsocial/locales/pt-PT.json, both renamed from app/javascript/mastodon/locales/pt.json
  673. Auto-merging app/javascript/gabsocial/locales/pt-BR.json
  674. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/pt-BR.json
  675. Auto-merging app/javascript/gabsocial/locales/pl.json
  676. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/pl.json
  677. Auto-merging app/javascript/gabsocial/locales/oc.json
  678. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/oc.json
  679. Auto-merging app/javascript/gabsocial/locales/no.json
  680. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/no.json
  681. CONFLICT (file location): app/javascript/mastodon/locales/nn.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/nn.json.
  682. Auto-merging app/javascript/gabsocial/locales/nl.json
  683. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/nl.json
  684. Auto-merging app/javascript/gabsocial/locales/ms.json
  685. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/ms.json
  686. CONFLICT (file location): app/javascript/mastodon/locales/mr.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/mr.json.
  687. CONFLICT (file location): app/javascript/mastodon/locales/ml.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/ml.json.
  688. CONFLICT (file location): app/javascript/mastodon/locales/mk.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/mk.json.
  689. Auto-merging app/javascript/gabsocial/locales/lv.json
  690. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/lv.json
  691. CONFLICT (file location): app/javascript/mastodon/locales/lt.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/lt.json.
  692. Auto-merging app/javascript/gabsocial/locales/ko.json
  693. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/ko.json
  694. CONFLICT (file location): app/javascript/mastodon/locales/kn.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/kn.json.
  695. Auto-merging app/javascript/gabsocial/locales/kk.json
  696. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/kk.json
  697. Auto-merging app/javascript/gabsocial/locales/ka.json
  698. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/ka.json
  699. Auto-merging app/javascript/gabsocial/locales/ja.json
  700. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/ja.json
  701. Auto-merging app/javascript/gabsocial/locales/it.json
  702. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/it.json
  703. Auto-merging app/javascript/gabsocial/locales/io.json
  704. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/io.json
  705. Auto-merging app/javascript/gabsocial/locales/id.json
  706. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/id.json
  707. Auto-merging app/javascript/gabsocial/locales/hy.json
  708. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/hy.json
  709. Auto-merging app/javascript/gabsocial/locales/hr.json
  710. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/hr.json
  711. Auto-merging app/javascript/gabsocial/locales/hi.json
  712. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/hi.json
  713. Auto-merging app/javascript/gabsocial/locales/he.json
  714. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/he.json
  715. Auto-merging app/javascript/gabsocial/locales/gl.json
  716. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/gl.json
  717. CONFLICT (file location): app/javascript/mastodon/locales/ga.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/ga.json.
  718. CONFLICT (rename/rename): Rename app/javascript/mastodon/locales/ta.json->app/javascript/gabsocial/locales/ga.json in HEAD. Rename app/javascript/mastodon/locales/ga.json->app/javascript/gabsocial/locales/ga.json in mastodon/master
  719. Auto-merging version of app/javascript/gabsocial/locales/ga.json from app/javascript/mastodon/locales/ta.json
  720. Auto-merging app/javascript/gabsocial/locales/ga.json
  721. Auto-merging app/javascript/gabsocial/locales/fr.json
  722. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/fr.json
  723. Auto-merging app/javascript/gabsocial/locales/fi.json
  724. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/fi.json
  725. Auto-merging app/javascript/gabsocial/locales/fa.json
  726. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/fa.json
  727. Auto-merging app/javascript/gabsocial/locales/eu.json
  728. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/eu.json
  729. CONFLICT (file location): app/javascript/mastodon/locales/et.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/et.json.
  730. Auto-merging app/javascript/gabsocial/locales/es.json
  731. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/es.json
  732. CONFLICT (file location): app/javascript/mastodon/locales/es-AR.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/es-AR.json.
  733. Auto-merging app/javascript/gabsocial/locales/eo.json
  734. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/eo.json
  735. Auto-merging app/javascript/gabsocial/locales/en.json
  736. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/en.json
  737. Auto-merging app/javascript/gabsocial/locales/el.json
  738. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/el.json
  739. Auto-merging app/javascript/gabsocial/locales/defaultMessages.json
  740. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/defaultMessages.json
  741. Auto-merging app/javascript/gabsocial/locales/de.json
  742. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/de.json
  743. Auto-merging app/javascript/gabsocial/locales/da.json
  744. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/da.json
  745. Auto-merging app/javascript/gabsocial/locales/cy.json
  746. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/cy.json
  747. Auto-merging app/javascript/gabsocial/locales/cs.json
  748. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/cs.json
  749. Auto-merging app/javascript/gabsocial/locales/co.json
  750. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/co.json
  751. Auto-merging app/javascript/gabsocial/locales/ca.json
  752. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/ca.json
  753. CONFLICT (file location): app/javascript/mastodon/locales/br.json added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/locales/br.json.
  754. CONFLICT (rename/rename): Rename app/javascript/mastodon/locales/bn.json->app/javascript/gabsocial/locales/br.json in HEAD. Rename app/javascript/mastodon/locales/br.json->app/javascript/gabsocial/locales/br.json in mastodon/master
  755. Auto-merging version of app/javascript/gabsocial/locales/br.json from app/javascript/mastodon/locales/bn.json
  756. Auto-merging app/javascript/gabsocial/locales/br.json
  757. Auto-merging app/javascript/gabsocial/locales/bg.json
  758. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/bg.json
  759. Auto-merging app/javascript/gabsocial/locales/ast.json
  760. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/ast.json
  761. Auto-merging app/javascript/gabsocial/locales/ar.json
  762. CONFLICT (content): Merge conflict in app/javascript/gabsocial/locales/ar.json
  763. CONFLICT (file location): app/javascript/mastodon/load_keyboard_extensions.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/load_keyboard_extensions.js.
  764. Auto-merging app/javascript/gabsocial/initial_state.js
  765. CONFLICT (content): Merge conflict in app/javascript/gabsocial/initial_state.js
  766. Auto-merging app/javascript/gabsocial/features/video/index.js
  767. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/video/index.js
  768. Auto-merging app/javascript/gabsocial/features/ui/util/async-components.js
  769. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/ui/util/async-components.js
  770. Auto-merging app/javascript/gabsocial/features/ui/index.js
  771. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/ui/index.js
  772. Auto-merging app/javascript/gabsocial/features/ui/containers/status_list_container.js
  773. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/ui/containers/status_list_container.js
  774. Auto-merging app/javascript/gabsocial/features/ui/components/video_modal.js
  775. CONFLICT (file location): app/javascript/mastodon/features/ui/components/notifications_counter_icon.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/features/ui/components/notifications_counter_icon.js.
  776. CONFLICT (file location): app/javascript/mastodon/features/ui/components/navigation_panel.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/features/ui/components/navigation_panel.js.
  777. Auto-merging app/javascript/gabsocial/features/ui/components/modal_root.js
  778. Auto-merging app/javascript/gabsocial/features/ui/components/media_modal.js
  779. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/ui/components/media_modal.js
  780. CONFLICT (file location): app/javascript/mastodon/features/ui/components/list_panel.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/features/ui/components/list_panel.js.
  781. CONFLICT (file location): app/javascript/mastodon/features/ui/components/link_footer.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/features/ui/components/link_footer.js.
  782. CONFLICT (file location): app/javascript/mastodon/features/ui/components/follow_requests_nav_link.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/features/ui/components/follow_requests_nav_link.js.
  783. Auto-merging app/javascript/gabsocial/features/ui/components/embed_modal.js
  784. CONFLICT (file location): app/javascript/mastodon/features/ui/components/document_title.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/features/ui/components/document_title.js.
  785. CONFLICT (file location): app/javascript/mastodon/features/ui/components/compose_panel.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/features/ui/components/compose_panel.js.
  786. Auto-merging app/javascript/gabsocial/features/ui/components/column_loading.js
  787. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/ui/components/column_loading.js
  788. Auto-merging app/javascript/gabsocial/features/ui/components/boost_modal.js
  789. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/ui/components/boost_modal.js
  790. CONFLICT (file location): app/javascript/mastodon/features/ui/components/block_modal.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/features/ui/components/block_modal.js.
  791. CONFLICT (file location): app/javascript/mastodon/features/ui/components/audio_modal.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/features/ui/components/audio_modal.js.
  792. Auto-merging app/javascript/gabsocial/features/ui/components/actions_modal.js
  793. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/ui/components/actions_modal.js
  794. Auto-merging app/javascript/gabsocial/features/status/index.js
  795. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/status/index.js
  796. Auto-merging app/javascript/gabsocial/features/status/containers/detailed_status_container.js
  797. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/status/containers/detailed_status_container.js
  798. Auto-merging app/javascript/gabsocial/features/status/components/detailed_status.js
  799. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/status/components/detailed_status.js
  800. Auto-merging app/javascript/gabsocial/features/status/components/card.js
  801. Auto-merging app/javascript/gabsocial/features/status/components/action_bar.js
  802. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/status/components/action_bar.js
  803. CONFLICT (file location): app/javascript/mastodon/features/search/index.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/features/search/index.js.
  804. Auto-merging app/javascript/gabsocial/features/reblogs/index.js
  805. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/reblogs/index.js
  806. Auto-merging app/javascript/gabsocial/features/pinned_statuses/index.js
  807. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/pinned_statuses/index.js
  808. Auto-merging app/javascript/gabsocial/features/notifications/index.js
  809. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/notifications/index.js
  810. Auto-merging app/javascript/gabsocial/features/notifications/components/notification.js
  811. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/notifications/components/notification.js
  812. Auto-merging app/javascript/gabsocial/features/notifications/components/filter_bar.js
  813. Auto-merging app/javascript/gabsocial/features/mutes/index.js
  814. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/mutes/index.js
  815. Auto-merging app/javascript/gabsocial/features/lists/index.js
  816. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/lists/index.js
  817. Auto-merging app/javascript/gabsocial/features/lists/components/new_list_form.js
  818. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/lists/components/new_list_form.js
  819. Auto-merging app/javascript/gabsocial/features/list_timeline/index.js
  820. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/list_timeline/index.js
  821. Auto-merging app/javascript/gabsocial/features/list_editor/components/edit_list_form.js
  822. Auto-merging app/javascript/gabsocial/features/home_timeline/index.js
  823. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/home_timeline/index.js
  824. Auto-merging app/javascript/gabsocial/features/hashtag_timeline/index.js
  825. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/hashtag_timeline/index.js
  826. Auto-merging app/javascript/gabsocial/features/getting_started/index.js
  827. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/getting_started/index.js
  828. CONFLICT (file location): app/javascript/mastodon/features/getting_started/containers/trends_container.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/features/getting_started/containers/trends_container.js.
  829. CONFLICT (file location): app/javascript/mastodon/features/getting_started/components/trends.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/features/getting_started/components/trends.js.
  830. Auto-merging app/javascript/gabsocial/features/follow_requests/index.js
  831. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/follow_requests/index.js
  832. Auto-merging app/javascript/gabsocial/features/favourites/index.js
  833. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/favourites/index.js
  834. Auto-merging app/javascript/gabsocial/features/domain_blocks/index.js
  835. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/domain_blocks/index.js
  836. CONFLICT (file location): app/javascript/mastodon/features/directory/index.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/features/directory/index.js.
  837. CONFLICT (file location): app/javascript/mastodon/features/directory/components/account_card.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/features/directory/components/account_card.js.
  838. Auto-merging app/javascript/gabsocial/features/direct_timeline/index.js
  839. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/direct_timeline/index.js
  840. Auto-merging app/javascript/gabsocial/features/direct_timeline/components/conversation.js
  841. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/direct_timeline/components/conversation.js
  842. Auto-merging app/javascript/gabsocial/features/compose/index.js
  843. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/compose/index.js
  844. Auto-merging app/javascript/gabsocial/features/compose/containers/sensitive_button_container.js
  845. Auto-merging app/javascript/gabsocial/features/compose/containers/poll_form_container.js
  846. Auto-merging app/javascript/gabsocial/features/compose/containers/compose_form_container.js
  847. Auto-merging app/javascript/gabsocial/features/compose/components/upload_progress.js
  848. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/compose/components/upload_progress.js
  849. Auto-merging app/javascript/gabsocial/features/compose/components/upload_form.js
  850. Auto-merging app/javascript/gabsocial/features/compose/components/upload.js
  851. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/compose/components/upload.js
  852. Auto-merging app/javascript/gabsocial/features/compose/components/search_results.js
  853. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/compose/components/search_results.js
  854. Auto-merging app/javascript/gabsocial/features/compose/components/search.js
  855. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/compose/components/search.js
  856. Auto-merging app/javascript/gabsocial/features/compose/components/reply_indicator.js
  857. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/compose/components/reply_indicator.js
  858. Auto-merging app/javascript/gabsocial/features/compose/components/privacy_dropdown.js
  859. Auto-merging app/javascript/gabsocial/features/compose/components/poll_form.js
  860. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/compose/components/poll_form.js
  861. Auto-merging app/javascript/gabsocial/features/compose/components/navigation_bar.js
  862. Auto-merging app/javascript/gabsocial/features/compose/components/compose_form.js
  863. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/compose/components/compose_form.js
  864. Auto-merging app/javascript/gabsocial/features/compose/components/action_bar.js
  865. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/compose/components/action_bar.js
  866. Auto-merging app/javascript/gabsocial/features/community_timeline/components/column_settings.js
  867. CONFLICT (file location): app/javascript/mastodon/features/bookmarked_statuses/index.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/features/bookmarked_statuses/index.js.
  868. Auto-merging app/javascript/gabsocial/features/blocks/index.js
  869. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/blocks/index.js
  870. CONFLICT (file location): app/javascript/mastodon/features/audio/index.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/features/audio/index.js.
  871. Auto-merging app/javascript/gabsocial/features/account_gallery/components/media_item.js
  872. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/account_gallery/components/media_item.js
  873. Auto-merging app/javascript/gabsocial/features/account/components/header.js
  874. CONFLICT (content): Merge conflict in app/javascript/gabsocial/features/account/components/header.js
  875. Auto-merging app/javascript/gabsocial/containers/status_container.js
  876. CONFLICT (content): Merge conflict in app/javascript/gabsocial/containers/status_container.js
  877. Auto-merging app/javascript/gabsocial/containers/media_container.js
  878. CONFLICT (content): Merge conflict in app/javascript/gabsocial/containers/media_container.js
  879. Auto-merging app/javascript/gabsocial/containers/gabsocial.js
  880. CONFLICT (content): Merge conflict in app/javascript/gabsocial/containers/gabsocial.js
  881. Auto-merging app/javascript/gabsocial/components/status_list.js
  882. CONFLICT (content): Merge conflict in app/javascript/gabsocial/components/status_list.js
  883. Auto-merging app/javascript/gabsocial/components/status_content.js
  884. CONFLICT (content): Merge conflict in app/javascript/gabsocial/components/status_content.js
  885. Auto-merging app/javascript/gabsocial/components/status_action_bar.js
  886. CONFLICT (content): Merge conflict in app/javascript/gabsocial/components/status_action_bar.js
  887. Auto-merging app/javascript/gabsocial/components/status.js
  888. CONFLICT (content): Merge conflict in app/javascript/gabsocial/components/status.js
  889. Auto-merging app/javascript/gabsocial/components/scrollable_list.js
  890. CONFLICT (content): Merge conflict in app/javascript/gabsocial/components/scrollable_list.js
  891. CONFLICT (file location): app/javascript/mastodon/components/regeneration_indicator.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/components/regeneration_indicator.js.
  892. CONFLICT (file location): app/javascript/mastodon/components/radio_button.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/components/radio_button.js.
  893. Auto-merging app/javascript/gabsocial/components/poll.js
  894. Auto-merging app/javascript/gabsocial/components/modal_root.js
  895. CONFLICT (content): Merge conflict in app/javascript/gabsocial/components/modal_root.js
  896. Auto-merging app/javascript/gabsocial/components/missing_indicator.js
  897. CONFLICT (content): Merge conflict in app/javascript/gabsocial/components/missing_indicator.js
  898. CONFLICT (file location): app/javascript/mastodon/components/load_pending.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/components/load_pending.js.
  899. CONFLICT (file location): app/javascript/mastodon/components/icon_with_badge.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/components/icon_with_badge.js.
  900. Auto-merging app/javascript/gabsocial/components/icon_button.js
  901. Auto-merging app/javascript/gabsocial/components/hashtag.js
  902. CONFLICT (content): Merge conflict in app/javascript/gabsocial/components/hashtag.js
  903. CONFLICT (file location): app/javascript/mastodon/components/gifv.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/components/gifv.js.
  904. CONFLICT (rename/delete): app/javascript/mastodon/components/extended_video_player.js deleted in mastodon/master and renamed to app/javascript/gabsocial/components/extended_video_player.js in HEAD. Version HEAD of app/javascript/gabsocial/components/extended_video_player.js left in tree.
  905. Auto-merging app/javascript/gabsocial/components/error_boundary.js
  906. CONFLICT (content): Merge conflict in app/javascript/gabsocial/components/error_boundary.js
  907. Auto-merging app/javascript/gabsocial/components/dropdown_menu.js
  908. CONFLICT (content): Merge conflict in app/javascript/gabsocial/components/dropdown_menu.js
  909. Auto-merging app/javascript/gabsocial/components/display_name.js
  910. CONFLICT (content): Merge conflict in app/javascript/gabsocial/components/display_name.js
  911. Auto-merging app/javascript/gabsocial/components/column_header.js
  912. CONFLICT (content): Merge conflict in app/javascript/gabsocial/components/column_header.js
  913. Auto-merging app/javascript/gabsocial/components/column_back_button.js
  914. CONFLICT (content): Merge conflict in app/javascript/gabsocial/components/column_back_button.js
  915. CONFLICT (file location): app/javascript/mastodon/components/autosuggest_input.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/components/autosuggest_input.js.
  916. CONFLICT (rename/rename): Rename app/javascript/mastodon/components/autosuggest_textarea.js->app/javascript/gabsocial/components/autosuggest_input.js in HEAD. Rename app/javascript/mastodon/components/autosuggest_input.js->app/javascript/gabsocial/components/autosuggest_input.js in mastodon/master
  917. Auto-merging version of app/javascript/gabsocial/components/autosuggest_input.js from app/javascript/mastodon/components/autosuggest_textarea.js
  918. Auto-merging app/javascript/gabsocial/components/autosuggest_input.js
  919. CONFLICT (file location): app/javascript/mastodon/components/autosuggest_hashtag.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/components/autosuggest_hashtag.js.
  920. Auto-merging app/javascript/gabsocial/components/attachment_list.js
  921. Auto-merging app/javascript/gabsocial/compare_id.js
  922. CONFLICT (content): Merge conflict in app/javascript/gabsocial/compare_id.js
  923. CONFLICT (file location): app/javascript/mastodon/actions/trends.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/actions/trends.js.
  924. Auto-merging app/javascript/gabsocial/actions/timelines.js
  925. CONFLICT (content): Merge conflict in app/javascript/gabsocial/actions/timelines.js
  926. Auto-merging app/javascript/gabsocial/actions/statuses.js
  927. CONFLICT (content): Merge conflict in app/javascript/gabsocial/actions/statuses.js
  928. Auto-merging app/javascript/gabsocial/actions/search.js
  929. Auto-merging app/javascript/gabsocial/actions/notifications.js
  930. CONFLICT (content): Merge conflict in app/javascript/gabsocial/actions/notifications.js
  931. CONFLICT (file location): app/javascript/mastodon/actions/markers.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/actions/markers.js.
  932. Auto-merging app/javascript/gabsocial/actions/interactions.js
  933. Auto-merging app/javascript/gabsocial/actions/domain_blocks.js
  934. CONFLICT (file location): app/javascript/mastodon/actions/directory.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/actions/directory.js.
  935. Auto-merging app/javascript/gabsocial/actions/conversations.js
  936. Auto-merging app/javascript/gabsocial/actions/compose.js
  937. CONFLICT (content): Merge conflict in app/javascript/gabsocial/actions/compose.js
  938. CONFLICT (file location): app/javascript/mastodon/actions/bookmarks.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/actions/bookmarks.js.
  939. Auto-merging app/javascript/gabsocial/actions/blocks.js
  940. CONFLICT (content): Merge conflict in app/javascript/gabsocial/actions/blocks.js
  941. CONFLICT (file location): app/javascript/mastodon/actions/app.js added in mastodon/master inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to app/javascript/gabsocial/actions/app.js.
  942. Auto-merging app/javascript/gabsocial/actions/alerts.js
  943. Auto-merging app/helpers/statuses_helper.rb
  944. CONFLICT (content): Merge conflict in app/helpers/statuses_helper.rb
  945. Auto-merging app/helpers/jsonld_helper.rb
  946. CONFLICT (content): Merge conflict in app/helpers/jsonld_helper.rb
  947. Auto-merging app/helpers/application_helper.rb
  948. CONFLICT (content): Merge conflict in app/helpers/application_helper.rb
  949. Auto-merging app/helpers/admin/action_logs_helper.rb
  950. CONFLICT (modify/delete): app/controllers/stream_entries_controller.rb deleted in mastodon/master and modified in HEAD. Version HEAD of app/controllers/stream_entries_controller.rb left in tree.
  951. Auto-merging app/controllers/statuses_controller.rb
  952. CONFLICT (content): Merge conflict in app/controllers/statuses_controller.rb
  953. Auto-merging app/controllers/settings/preferences_controller.rb
  954. CONFLICT (content): Merge conflict in app/controllers/settings/preferences_controller.rb
  955. CONFLICT (modify/delete): app/controllers/settings/notifications_controller.rb deleted in mastodon/master and modified in HEAD. Version HEAD of app/controllers/settings/notifications_controller.rb left in tree.
  956. Auto-merging app/controllers/settings/exports_controller.rb
  957. CONFLICT (modify/delete): app/controllers/remote_unfollows_controller.rb deleted in mastodon/master and modified in HEAD. Version HEAD of app/controllers/remote_unfollows_controller.rb left in tree.
  958. Auto-merging app/controllers/remote_interaction_controller.rb
  959. CONFLICT (content): Merge conflict in app/controllers/remote_interaction_controller.rb
  960. Auto-merging app/controllers/media_proxy_controller.rb
  961. Auto-merging app/controllers/media_controller.rb
  962. CONFLICT (content): Merge conflict in app/controllers/media_controller.rb
  963. CONFLICT (modify/delete): app/controllers/home_controller.rb deleted in HEAD and modified in mastodon/master. Version mastodon/master of app/controllers/home_controller.rb left in tree.
  964. Auto-merging app/controllers/following_accounts_controller.rb
  965. CONFLICT (content): Merge conflict in app/controllers/following_accounts_controller.rb
  966. Auto-merging app/controllers/follower_accounts_controller.rb
  967. CONFLICT (content): Merge conflict in app/controllers/follower_accounts_controller.rb
  968. Auto-merging app/controllers/concerns/signature_verification.rb
  969. CONFLICT (content): Merge conflict in app/controllers/concerns/signature_verification.rb
  970. Auto-merging app/controllers/concerns/account_controller_concern.rb
  971. CONFLICT (content): Merge conflict in app/controllers/concerns/account_controller_concern.rb
  972. Auto-merging app/controllers/auth/sessions_controller.rb
  973. Auto-merging app/controllers/application_controller.rb
  974. CONFLICT (content): Merge conflict in app/controllers/application_controller.rb
  975. CONFLICT (add/add): Merge conflict in app/controllers/api/v1/trends_controller.rb
  976. Auto-merging app/controllers/api/v1/trends_controller.rb
  977. Removing app/controllers/api/v1/timelines/direct_controller.rb
  978. Auto-merging app/controllers/api/v1/statuses_controller.rb
  979. Auto-merging app/controllers/api/v1/statuses/reblogs_controller.rb
  980. CONFLICT (modify/delete): app/controllers/api/v1/search_controller.rb deleted in mastodon/master and modified in HEAD. Version HEAD of app/controllers/api/v1/search_controller.rb left in tree.
  981. Auto-merging app/controllers/api/v1/instances/activity_controller.rb
  982. Removing app/controllers/api/v1/follows_controller.rb
  983. Removing app/controllers/api/subscriptions_controller.rb
  984. Removing app/controllers/api/salmon_controller.rb
  985. Removing app/controllers/api/push_controller.rb
  986. Auto-merging app/controllers/api/base_controller.rb
  987. CONFLICT (content): Merge conflict in app/controllers/api/base_controller.rb
  988. Auto-merging app/controllers/admin/domain_blocks_controller.rb
  989. CONFLICT (content): Merge conflict in app/controllers/admin/domain_blocks_controller.rb
  990. Auto-merging app/controllers/admin/dashboard_controller.rb
  991. Auto-merging app/controllers/admin/accounts_controller.rb
  992. CONFLICT (content): Merge conflict in app/controllers/admin/accounts_controller.rb
  993. Auto-merging app/controllers/admin/account_actions_controller.rb
  994. CONFLICT (content): Merge conflict in app/controllers/admin/account_actions_controller.rb
  995. Auto-merging app/controllers/accounts_controller.rb
  996. CONFLICT (content): Merge conflict in app/controllers/accounts_controller.rb
  997. Auto-merging app/controllers/about_controller.rb
  998. CONFLICT (content): Merge conflict in app/controllers/about_controller.rb
  999. Auto-merging app.json
  1000. Auto-merging README.md
  1001. CONFLICT (content): Merge conflict in README.md
  1002. Auto-merging Gemfile.lock
  1003. CONFLICT (content): Merge conflict in Gemfile.lock
  1004. Auto-merging Gemfile
  1005. CONFLICT (content): Merge conflict in Gemfile
  1006. Auto-merging Dockerfile
  1007. CONFLICT (content): Merge conflict in Dockerfile
  1008. Auto-merging CONTRIBUTING.md
  1009. CONFLICT (content): Merge conflict in CONTRIBUTING.md
  1010. Auto-merging CHANGELOG.md
  1011. CONFLICT (content): Merge conflict in CHANGELOG.md
  1012. Auto-merging AUTHORS.md
  1013. CONFLICT (content): Merge conflict in AUTHORS.md
  1014. Removing .scss-lint.yml
  1015. Auto-merging .rubocop.yml
  1016. Auto-merging .gitignore
  1017. CONFLICT (add/add): Merge conflict in .github/FUNDING.yml
  1018. Auto-merging .github/FUNDING.yml
  1019. Auto-merging .env.vagrant
  1020. CONFLICT (content): Merge conflict in .env.vagrant
  1021. Auto-merging .env.test
  1022. Auto-merging .env.production.sample
  1023. Auto-merging .env.nanobox
  1024. CONFLICT (add/add): Merge conflict in .dependabot/config.yml
  1025. Auto-merging .dependabot/config.yml
  1026. CONFLICT (modify/delete): .circleci/config.yml deleted in HEAD and modified in mastodon/master. Version mastodon/master of .circleci/config.yml left in tree.
  1027. Automatic merge failed; fix conflicts and then commit the result.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
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!