From cd1c9032604dce6a99da765543e51afb27db09cc Mon Sep 17 00:00:00 2001
From: Alex Huang <alex@cloud.com>
Date: Mon, 1 Nov 2010 10:49:58 -0700
Subject: [PATCH] Better integration between it and virtual machine gurus

---
 .../src/com/cloud/network/router/DomainRouterManagerImpl.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/src/com/cloud/network/router/DomainRouterManagerImpl.java b/server/src/com/cloud/network/router/DomainRouterManagerImpl.java
index 7f268635d50..ff6b2c70160 100644
--- a/server/src/com/cloud/network/router/DomainRouterManagerImpl.java
+++ b/server/src/com/cloud/network/router/DomainRouterManagerImpl.java
@@ -51,8 +51,8 @@ import com.cloud.agent.api.StartRouterAnswer;
 import com.cloud.agent.api.StartRouterCommand;
 import com.cloud.agent.api.StopCommand;
 import com.cloud.agent.api.routing.DhcpEntryCommand;
-import com.cloud.agent.api.routing.SavePasswordCommand;
 import com.cloud.agent.api.routing.RemoteAccessVpnCfgCommand;
+import com.cloud.agent.api.routing.SavePasswordCommand;
 import com.cloud.agent.api.routing.VmDataCommand;
 import com.cloud.agent.api.to.NicTO;
 import com.cloud.agent.api.to.VirtualMachineTO;
@@ -2108,7 +2108,6 @@ public class DomainRouterManagerImpl implements DomainRouterManager, VirtualMach
         return true;
     }
 
-<<<<<<< HEAD
 	@Override
 	public RemoteAccessVpnVO startRemoteAccessVpn(RemoteAccessVpnVO vpnVO) {
 		DomainRouterVO router = getRouter(vpnVO.getAccountId(), vpnVO.getZoneId());