Resolve conflicts in doc/api/README.md

e36e1c35 · Stan Hu · 310d7d05 · e36e1c35
Commit e36e1c35 authored Oct 06, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -26,10 +26,7 @@ following locations:
 - [Epic Issues](epic_issues.md) **[ULTIMATE]**
 - [Events](events.md)
 - [Feature flags](features.md)
-<<<<<<< HEAD
 - [Geo Nodes](geo_nodes.md) **[PREMIUM]**
-=======
->>>>>>> upstream/master
 - [Gitignore templates](templates/gitignores.md)
 - [GitLab CI Config templates](templates/gitlab_ci_ymls.md)
 - [Groups](groups.md)