From 1be5e0827007ca21aad9ac30dde16664ccd0295c Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Mon, 4 Jun 2012 18:10:40 -0700
Subject: [PATCH] CS-15057: Remove jquery.timer.js from source code. Replace it
 with native JavaScript functions. (remove conflict mark)

---
 ui/scripts/system.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 1c320b4e86b..c5f0a9c70f6 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -1350,14 +1350,11 @@
 													else if($form.find('.form-item[rel=projectId]').css("display") != "none") {  //project-specific
 														array1.push("&projectid=" + args.data.projectId);
 														array1.push("&acltype=account");
-<<<<<<< HEAD
-=======
 														
 														if ($form.find('.form-item[rel=subdomainaccess]:visible input:checked').size())
 															array1.push("&subdomainaccess=true");
 														else
 															array1.push("&subdomainaccess=false");
->>>>>>> CS-15057: Remove jquery.timer.js from source code. Replace it with native JavaScript functions.
 													}
 													else {  //domain-specific
 														array1.push("&acltype=domain");
@@ -1830,9 +1827,6 @@
 							notification: {
 								poll: pollAsyncJobResult
 							}
-<<<<<<< HEAD
-						}
-=======
 						},
 						enable: {
               label: 'label.action.enable.physical.network',
@@ -1908,7 +1902,6 @@
               },
               notification: { poll: pollAsyncJobResult }
             }
->>>>>>> CS-15057: Remove jquery.timer.js from source code. Replace it with native JavaScript functions.
 					}
         },
         dataProvider: function(args) {