Fixed conflicts

iCAPLyon1 · Nov 17, 2015 · 607e741 · 607e741
1 parent ad97ea3
commit 607e741
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Resources/views/Formula/plugin.js.html.twig b/Resources/views/Formula/plugin.js.html.twig
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <script>
     (function () {
         'use strict';
@@ -69,6 +68,3 @@
         tinymce.claroline.plugins.formula = true;
     }());
 </script>
-=======
-<script src="{{ asset('tinymce/plugins/formula/plugin.min.js') }}"></script>
->>>>>>> 3529886f720e07cc8e67c06750c3575638531afe