fix conflicts

2015-03-31 17:52:18 +08:00
parent fbf819f4d2
commit ce0e099bbd
5 changed files with 18 additions and 14 deletions
--- a/conf/routes
+++ b/conf/routes
@ -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