fix conflicts

2014-04-20 22:54:28 -03:00 · 2014-04-20 22:54:28 -03:00 · 009d7b75b8
commit 009d7b75b8
parent a2be737bad a50f4cc638
13 changed files with 261 additions and 113 deletions
--- a/js/routes.js
+++ b/js/routes.js
@ -18,9 +18,8 @@ angular
        templateUrl: 'setup.html',
        validate: false
      })
-      .when('/home', {
-        templateUrl: 'home.html',
-        validate: true
+      .when('/addresses', {
+        templateUrl: 'addresses.html'
      })
      .when('/join/:id', {
        templateUrl: 'join.html',