resolve failed merge markers

jessica · jessica · commit c17cda2a37bc · 2010-08-20T18:15:24.000-07:00
diff --git a/ui/content/tab_storage.html b/ui/content/tab_storage.html
@@ -611,11 +611,7 @@ <h3>
                 <div class="grid_headertitles">
                     Name</div>
             </div>
-<<<<<<< HEAD
-            <div class="grid_genheader_cell" style="width: 10%;">
-=======
             <div class="grid_genheader_cell" style="width: 15%;">
->>>>>>> 418f895... Issue #: 5986
                 <div class="grid_headertitles">
                     Type</div>
             </div>
@@ -707,11 +703,7 @@ <h3>
             <div class="netgrid_celltitles" id="volume_name">
                 Name</div>
         </div>
-<<<<<<< HEAD
-        <div class="grid_smallgenrow_cell" style="width: 10%;">
-=======
         <div class="grid_smallgenrow_cell" style="width: 15%;">
->>>>>>> 418f895... Issue #: 5986
             <div class="netgrid_celltitles" id="volume_type">
                 Type</div>
         </div>
diff --git a/ui/scripts/cloud.core.domains.js b/ui/scripts/cloud.core.domains.js
@@ -65,12 +65,8 @@ function showDomainsTab() {
     }    
     
     function drawTree(id, level, container) {		        
-        $.ajax({
-<<<<<<< HEAD
-	   data: createURL("command=listDomainChildren&id="+id+"&response=json"),
-=======
-		    data: "command=listDomainChildren&id="+id+"&response=json&pageSize=-1",
->>>>>>> e8446f8... Issue #: 5975
+        $.ajax({
+		    data: "command=listDomainChildren&id="+id+"&response=json&pageSize=-1",
 		    dataType: "json",
 		    async: false,
 		    success: function(json) {					        
@@ -324,12 +320,8 @@ function showDomainsTab() {
 	    rightPanelDetailContent.hide();
 	    rightPanelSearchResult.show();	                	        	
         var keyword = searchInput.val();             
-        $.ajax({
-<<<<<<< HEAD
-	   data: createURL("command=listDomains&keyword="+keyword+"&response=json"+maxPageSize),
-=======
-	        data: "command=listDomains&keyword="+keyword+"&response=json&pageSize=-1", //pageSize=-1 will return all items (no limitation)
->>>>>>> e8446f8... Issue #: 5975
+        $.ajax({
+	        data: "command=listDomains&keyword="+keyword+"&response=json&pageSize=-1", //pageSize=-1 will return all items (no limitation)
 	        dataType: "json",
 	        async: false,
 	        success: function(json) {					        
@@ -357,12 +349,8 @@ function showDomainsTab() {
 	//draw root node
 	function drawRootNode(rootDomainId) {
 	    treeContentBox.empty();
-	    $.ajax({
-<<<<<<< HEAD
-		   data: createURL("command=listDomains&id="+rootDomainId+"&response=json"),
-=======
-	        data: "command=listDomains&id="+rootDomainId+"&response=json&pageSize=-1", //pageSize=-1 will return all items (no limitation)
->>>>>>> e8446f8... Issue #: 5975
+	    $.ajax({
+	        data: "command=listDomains&id="+rootDomainId+"&response=json&pageSize=-1", //pageSize=-1 will return all items (no limitation)
 	        dataType: "json",
 	        async: false,
 	        success: function(json) {					        
