From b66a8613abbf64a7b70c55559cf476f265ed9a01 Mon Sep 17 00:00:00 2001
From: Tony Tam <fehguy@gmail.com>
Date: Tue, 17 Mar 2015 16:28:31 -0700
Subject: [PATCH] fixed build error

---
 src/main/javascript/doc.js | 1 -
 1 file changed, 1 deletion(-)

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