kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

Fixing merge conflict

Browse source
This commit is contained in:
Andrew Brown 2014-11-13 15:42:36 -05:00
parent 6632362ed0
commit 4a28cc4ba2
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/fog/opennebula/requests/compute/list_networks.rb
View file

@ -60,10 +60,7 @@ module Fog
:id => "5",
:name => name,
:uid => "5",
<<<<<<< HEAD
:uname => "mock",
=======
>>>>>>> ad708b85e5fe5a0cf6115321d078bed54a077073
:gid => "5",
:description => "netDescription",
:vlan => "5"