# HG changeset patch
-# Parent a76a9a0e0668f4191bdc383a0d4b3173f44b39b1
+# Parent d06b1f422ac5672c4a4c34bb3a50e98df42f3e31
-diff --git a/controllers/my_controller.py b/controllers/my_controller.py
---- a/controllers/my_controller.py
-+++ b/controllers/my_controller.py
+diff --git a/controllers/academy.py b/controllers/academy.py
+--- a/controllers/academy.py
++++ b/controllers/academy.py
@@ -6,4 +6,16 @@ from openerp.addons.web.controllers impo
- class my_controller(main.Home):
+ class academy(main.Home):
@http.route('/', auth='none')
def index(self):
- return "Hello, world!"