merge app js

2014-02-09 23:08:53 +01:00
parent 98d3032850
commit b910973ee6
1 changed files with 0 additions and 3 deletions
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,13 +12,10 @@
 //
 //= require jquery
 //= require jquery_ujs
-<<<<<<< HEAD
-=======
 //= require jquery.ui.all
 // require jquery.ui.draggable
 // require jquery.ui.sortable
 // require jquery.sortable
->>>>>>> bb8f427f953c2bcf84331b4eb1f8b5c7108e80e6
 // require jquery-ui
 //= require_tree .
 //= require tinymce-jquery