From 05bbd3586045345bd03fc027890270b07254cd51 Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@cloud.com>
Date: Thu, 11 Nov 2010 13:13:04 -0800
Subject: [PATCH] resolving the network manager merge conflict

---
 server/src/com/cloud/network/NetworkManager.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/src/com/cloud/network/NetworkManager.java b/server/src/com/cloud/network/NetworkManager.java
index 511012efb24..54fec363354 100644
--- a/server/src/com/cloud/network/NetworkManager.java
+++ b/server/src/com/cloud/network/NetworkManager.java
@@ -361,7 +361,6 @@ public interface NetworkManager {
 	
 	NetworkConfiguration getNetworkConfiguration(long id);
 	String getNextAvailableMacAddressInNetwork(long networkConfigurationId) throws InsufficientAddressCapacityException;
-	String getNextAvailableMacAddressInNetwork(long networkConfigurationId);
 
 	FirewallRuleVO createIpForwardingRuleInDb(String ipAddr, Long virtualMachineId) throws ServerApiException;