fix conflicts

chekun · Aug 4, 2013 · 034e635 · 034e635
1 parent 054c240
commit 034e635
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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);
 }
+