Fix conflicts

ee909b5f · Victor Wu · 09d4b2b1 · ee909b5f
Commit ee909b5f authored May 01, 2018 by Victor Wu
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

doc/development/README.md doc/development/README.md +0 -3

No files found.
--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -42,10 +42,7 @@ comments: false
 - [Avoid modules with instance variables](module_with_instance_variables.md) if possible
 - [How to dump production data to staging](db_dump.md)
 - [Working with the GitHub importer](github_importer.md)
-<<<<<<< HEAD
 - [Elasticsearch integration docs](elasticsearch.md)
-=======
->>>>>>> upstream/master
 - [Working with Merge Request diffs](diffs.md)

 ## Performance guides