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

@@ -1,6 +1,7 @@
 module Moip2
+<<<<<<< HEAD
   class KeysApi
     attr_reader :client
 
     def initialize(client)
       @client = client
@@ -13,5 +14,23 @@
     def show
       Resource::Keys.new client, client.get("#{base_path}")
     end
   end
 end
+=======
+	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
+>>>>>>> webhooks