conflict resolved 3

wbamberg · Nov 15, 2010 · 76a89c7 · 76a89c7
1 parent 8af5674
commit 76a89c7
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/apps/api/media/css/API.Browser.css b/apps/api/media/css/API.Browser.css
@@ -55,12 +55,7 @@ body {
 	#api-body h3.UI_Heading {
 		margin: 10px 0 8px;
 		margin-top: 30px;
-<<<<<<< HEAD
-		padding-top:5px;
-		padding-bottom:5px;
-=======
 		padding:5px;
->>>>>>> bug-611173-
 		font-weight: bold;
 		font-size: 1.5em;
 		border: solid 1px #ECEFF5;
@@ -145,13 +140,6 @@ body {
 		#api-body div.function-parameter-list
 			{
 			margin-left:20px;
-<<<<<<< HEAD
-		}
-
-		#api-body div.property-list
-			{
-			margin-left:60px;
-=======
 		}
 
 		#api-body div.property-list
@@ -162,7 +150,6 @@ body {
 		#api-body span.data-type
 			{
 			font-style:italic;
->>>>>>> bug-611173-
 		}
 
 		#api-body div.object-contents