Bgerstle has uploaded a new change for review. https://gerrit.wikimedia.org/r/201575
Change subject: remove conflict markers ...................................................................... remove conflict markers Change-Id: Ie0990bf083c11e611c8ea3e1e5da8180902ce818 --- M .gitignore 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/75/201575/1 diff --git a/.gitignore b/.gitignore index 9ad1598..8ecf4da 100644 --- a/.gitignore +++ b/.gitignore @@ -34,11 +34,8 @@ # FastLane screenshots/ -<<<<<<< HEAD fastlane/report.xml fastlane/Error*.png -======= ->>>>>>> 5cfa2bb... Setup Fastlane for CI # www node_modules/ -- To view, visit https://gerrit.wikimedia.org/r/201575 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0990bf083c11e611c8ea3e1e5da8180902ce818 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Bgerstle <bgers...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
