fix document

streamtw · streamtw · commit cb7f046c369a · 2017-04-20T01:39:38.000+08:00
diff --git a/docs/integration.md b/docs/integration.md
@@ -36,7 +36,6 @@ Check `vendor/unisharp/laravel-filemanager/src/views/demo.blade.php`, which alre
   ```
 
 ### Option 2: TinyMCE4
-<<<<<<< HEAD
 
 ```html
 <script src="//cdn.tinymce.com/4/tinymce.min.js"></script>
