fix conflicts

This commit is contained in:
life committed 2015-03-31 17:52:18 +08:00
1 parent fbf819f4d2
commit ce0e099bbd
5 files changed
+18 -14

No files matched your search

+1 -1
View File
@@ -5,7 +5,7 @@
module:testrunner
# Home is My Blog
Get / Index.Index
Get / Index.Default
GET /note Note.Index
# leanote home
GET /index Index.Index