Fix conflict resolving

6fab5364 · Valery Sizov · 0e786e30 · 6fab5364
Commit 6fab5364 authored Jun 27, 2016 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

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

No files found.
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -36,7 +36,6 @@ module API
    mount ::API::GroupMembers
    mount ::API::Groups
    mount ::API::Geo
-    mount ::API::Gitignores
    mount ::API::Internal
    mount ::API::Issues
    mount ::API::Keys