From 5aade501dce0a398c177f38237563de0504dda89 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Tue, 28 Feb 2012 17:06:23 -0800
Subject: [PATCH] fix merge conflicts

---
 .../com/cloud/network/MockNetworkManagerImpl.java     | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/server/test/com/cloud/network/MockNetworkManagerImpl.java b/server/test/com/cloud/network/MockNetworkManagerImpl.java
index e2b52906053..9c45e73b37e 100755
--- a/server/test/com/cloud/network/MockNetworkManagerImpl.java
+++ b/server/test/com/cloud/network/MockNetworkManagerImpl.java
@@ -291,10 +291,6 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
 
     }
 
-    @Override
-    	return false;
-    }
-
     @Override
     public boolean destroyNetwork(long networkId, ReservationContext context) {
         // TODO Auto-generated method stub
@@ -411,13 +407,6 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
         return null;
     }
 
-	@Override
-	public Network updateGuestNetwork(long networkId, String name,
-			String displayText, Account callerAccount, User callerUser,
-			String domainSuffix, Long networkOfferingId, Boolean changeCidr) {
-		// TODO Auto-generated method stub
-		return null;
-	}
     public Map<Service, Set<Provider>> getNetworkOfferingServiceProvidersMap(long networkOfferingId) {
         return null;
     }