Fixed conflicts

iCAPLyon1 · Nov 17, 2015 · ad97ea3 · ad97ea3
2 parents 3b98556 + 3529886
commit ad97ea3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Resources/public/tinymce/plugins/formula/plugin.js b/Resources/public/tinymce/plugins/formula/plugin.js
@@ -62,4 +62,4 @@
             }
         });
     });
-}());
+}());
diff --git a/Resources/views/Formula/plugin.js.html.twig b/Resources/views/Formula/plugin.js.html.twig
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <script>
     (function () {
         'use strict';
@@ -67,4 +68,7 @@
         });
         tinymce.claroline.plugins.formula = true;
     }());
-</script>
+</script>
+=======
+<script src="{{ asset('tinymce/plugins/formula/plugin.min.js') }}"></script>
+>>>>>>> 3529886f720e07cc8e67c06750c3575638531afe
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,4 +62,4 @@ @@
                 }
             });
         });
-    }());
+    }());