diff --git a/src/main/javascript/doc.js b/src/main/javascript/doc.js
index 121f4530..31252e4f 100644
--- a/src/main/javascript/doc.js
+++ b/src/main/javascript/doc.js
@@ -195,4 +195,3 @@ window.Docs = {
 		elem.slideUp();
 	}
 };
->>>>>>> afe232747b3d2f972d358c43688185d8fe3e7406