From b910973ee64c28c5c881a6a0957bea7f114ca266 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 9 Feb 2014 23:08:53 +0100 Subject: [PATCH] merge app js --- app/assets/javascripts/application.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 3630db1..419fd4b 100755 --- 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