From 034e6356453078a0f76a743277b37ff494a01a3a Mon Sep 17 00:00:00 2001
From: chekun <234267695@qq.com>
Date: Sun, 4 Aug 2013 17:28:08 +0800
Subject: [PATCH] fix conflicts

---
 admin/templates/default/js/dili_utility/upload.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/admin/templates/default/js/dili_utility/upload.js b/admin/templates/default/js/dili_utility/upload.js
index 7f37e5b..43ce6ab 100644
--- a/admin/templates/default/js/dili_utility/upload.js
+++ b/admin/templates/default/js/dili_utility/upload.js
@@ -1,4 +1,5 @@
 var uploaderSwitcher,uploadedfile,uploaded,uploaderContainer,attachContainer,loading,clipboardContainer,clipboard,clipboardStatus,need_context_menu;
+
 $(function()
 {
 	$.ajaxSetup({
@@ -169,3 +170,4 @@ function after_editor_upload(data)
     attachContainer.append(insert_new_attachment(file));
     uploadedfile.val(uploaded);
 }
+