merge

Eun Woo Song · Eun Woo Song · commit 949f462b6cca · 2013-01-05T11:46:39.000-05:00
diff --git a/src/main/scala/common/main.scala b/src/main/scala/common/main.scala
@@ -39,7 +39,6 @@ object HttpConstants {
   val PERCENT = ByteString("%")
   val PATH = ByteString("/")
   val QUERY = ByteString("?")
->>>>>>> a8ace1b9563b4975f56c67308b9e372bcd057908
 }
 
 /**
