Resolve conflict in lib/api/api.rb

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Resolve conflict in lib/api/api.rb
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
5c6d5f89 · Dmitriy Zaporozhets · 65971dcc · 5c6d5f89
Commit 5c6d5f89 authored Aug 25, 2018 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

lib/api/api.rb lib/api/api.rb +0 -5

No files found.
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -106,11 +106,6 @@ module API
    mount ::API::Features
    mount ::API::Files
    mount ::API::GroupBoards
-<<<<<<< HEAD
-    mount ::API::Groups
-    mount ::API::GroupBoards
-=======
->>>>>>> upstream/master
    mount ::API::GroupMilestones
    mount ::API::Groups
    mount ::API::GroupVariables