From 25a200c20139ee9727715a7c08f8e644dfa85dea Mon Sep 17 00:00:00 2001
From: NIKITA <nikita@cloud.com>
Date: Wed, 25 Aug 2010 11:11:29 -0700
Subject: [PATCH] removed merged issues

---
 ui/new/css/main.css | 70 +++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 40 deletions(-)

diff --git a/ui/new/css/main.css b/ui/new/css/main.css
index 0bcf04c026b..241b94e38b6 100644
--- a/ui/new/css/main.css
+++ b/ui/new/css/main.css
@@ -292,7 +292,7 @@ a:visited {
 	padding:0;
 }
 
-<<<<<<< HEAD
+
 .vmpopup_container_closebutton {
 	width:13px;
 	height:13px;
@@ -308,8 +308,7 @@ a:visited {
 	background:url(../images/vm_closebutton_hover.gif) no-repeat top left;
 }
 
-=======
->>>>>>> 10bc0b5... new UI - left menu, middle menu, instance
+
 .vmpopup_container_top {
 	width:737px;
 	height:30px;
@@ -1608,11 +1607,7 @@ a:visited {
 }
 
 .midmenu_textbox {
-<<<<<<< HEAD
-	width:165px;
-=======
-	width:150px;
->>>>>>> 10bc0b5... new UI - left menu, middle menu, instance
+	width:165px;	
 	height:auto;
 	float:left;
 	margin:0 0 0 10px;
@@ -1621,11 +1616,7 @@ a:visited {
 }
 
 .midmenu_textbox p {
-<<<<<<< HEAD
 	width:165px;
-=======
-	width:150px;
->>>>>>> 10bc0b5... new UI - left menu, middle menu, instance
 	height:auto;
 	float:left;
 	text-align:left;
@@ -1939,7 +1930,6 @@ a:visited {
 	background:url(../images/infoerror_icon.gif) no-repeat top left;
 }
 
-<<<<<<< HEAD
 .info_detailbox {
 	width:99%;
 	height:auto;
@@ -1965,30 +1955,30 @@ a:visited {
 	background:#ffe5e5 repeat top left;
 	color:#a90000;
 }
-=======
-.info_detailbox {
-	width:99%;
-	height:auto;
-	float:left;
-	background:#fffbe6 repeat top left;
-	border:1px dashed #CCC;
-	color:#333;
-	margin:0 0 0 0;
-	padding:0;
-}
-
-.info_detailbox p{
-	width:auto;
-	height:auto;
-	float:left;
-	text-align:left;
-	font-size:11px;
-	margin:10px;
-	padding:0;
-}
-
-.info_detailbox.errorbox {
-	background:#ffe5e5 repeat top left;
-	color:#a90000;
-}
->>>>>>> 10bc0b5... new UI - left menu, middle menu, instance
+
+.info_detailbox {
+	width:99%;
+	height:auto;
+	float:left;
+	background:#fffbe6 repeat top left;
+	border:1px dashed #CCC;
+	color:#333;
+	margin:0 0 0 0;
+	padding:0;
+}
+
+.info_detailbox p{
+	width:auto;
+	height:auto;
+	float:left;
+	text-align:left;
+	font-size:11px;
+	margin:10px;
+	padding:0;
+}
+
+.info_detailbox.errorbox {
+	background:#ffe5e5 repeat top left;
+	color:#a90000;
+}
+