lib/moip2/keys_api.rb in moip2-0.1.3 vs lib/moip2/keys_api.rb in moip2-0.1.4

@@ -1,24 +1,6 @@
 module Moip2
-<<<<<<< HEAD
-  class KeysApi
-    attr_reader :client
-
-    def initialize(client)
-      @client = client
-    end
-	
-    def base_path
-      "/v2/keys"
-    end
-		
-    def show
-      Resource::Keys.new client, client.get("#{base_path}")
-    end
-  end
-end
-=======
 	class KeysApi
 		attr_reader :client
 		
 		def initialize(client)
 			@client = client
@@ -31,6 +13,5 @@
 		def show
 			Resource::Keys.new(client, client.get("#{base_path}")) 
 		end
 	end
 end
->>>>>>> webhooks