Fixing merge conflict

2014-11-13 15:42:36 -05:00 · 2014-11-13 15:42:36 -05:00 · 4a28cc4ba2
parent 6632362ed0
commit 4a28cc4ba2
1 changed files with 0 additions and 3 deletions
--- a/lib/fog/opennebula/requests/compute/list_networks.rb
+++ b/lib/fog/opennebula/requests/compute/list_networks.rb
@ -60,10 +60,7 @@ module Fog
            :id    	     => "5",
            :name  	     => name,
            :uid   	     => "5",
-<<<<<<< HEAD
            :uname       => "mock",
-=======
->>>>>>> ad708b85e5fe5a0cf6115321d078bed54a077073
            :gid   	     => "5",
            :description => "netDescription",
            :vlan	       => "5"