From 47807e84522ec747ade709cf20f499cfc06f8d6b Mon Sep 17 00:00:00 2001
From: Prasanna Santhanam <tsp@apache.org>
Date: Mon, 15 Apr 2013 12:04:33 +0530
Subject: [PATCH] marvin_refactor: Fix merge issues with
 remoteAccessVPNResponse, and server

Duplicated methods creep in from bad merge

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
---
 .../apache/cloudstack/api/response/RemoteAccessVpnResponse.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java b/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
index 5e08bca6af2..2cbb3cad814 100644
--- a/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
@@ -107,5 +107,4 @@ public class RemoteAccessVpnResponse extends BaseResponse implements ControlledE
     public void setId(String id) {
         this.id = id;
     }
-
 }