From 786b1cabcf181317e2d3da6894b08b2987a5023f Mon Sep 17 00:00:00 2001
From: Sharath Babu <Sharath.Babu@citrix.com>
Date: Wed, 25 Jan 2017 16:02:11 +0530
Subject: [PATCH] Fixing build issues in Messages.Designer.cs

Signed-Off-by: Sharath Babu <sharath.babu@citrix.com>
---
 XenModel/Messages.Designer.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs
index 8f43ae20b..81af49606 100755
--- a/XenModel/Messages.Designer.cs
+++ b/XenModel/Messages.Designer.cs
@@ -11342,7 +11342,7 @@ namespace XenAdmin {
         public static string DISABLED_VMSS {
             get {
                 return ResourceManager.GetString("DISABLED_VMSS", resourceCulture);
-			{
+			}
 		}
 		
         /// <summary>		
@@ -13650,7 +13650,7 @@ namespace XenAdmin {
         public static string ENABLED_VMSS {
             get {
                 return ResourceManager.GetString("ENABLED_VMSS", resourceCulture);
-			{
+			 }
 		}
 
         /// <summary>		
@@ -23413,7 +23413,6 @@ namespace XenAdmin {
         public static string NEW_SEARCH {
             get {
                 return ResourceManager.GetString("NEW_SEARCH", resourceCulture);
->>>>>>> refs/remotes/xenserver/CAR-2205
             }
         }