fixed build error

2015-03-17 16:28:31 -07:00
parent 972188c97d
commit b66a8613ab
1 changed files with 0 additions and 1 deletions
--- a/src/main/javascript/doc.js
+++ b/src/main/javascript/doc.js
@@ -195,4 +195,3 @@ window.Docs = {
 		elem.slideUp();
 	}
 };
->>>>>>> afe232747b3d2f972d358c43688185d8fe3e7406