#9 Fixing a fucked merge. Goddam it.

cybertooth-io · Jan 23, 2019 · fafdbf6 · fafdbf6
1 parent 981bfd3
commit fafdbf6
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 185 deletions.
diff --git a/app/router.js b/app/router.js
@@ -27,8 +27,6 @@ Router.map(function () {
       this.route('address');
       this.route('locale-timezone');
     });
-    this.route('change-password');
-    this.route('update-profile');
   });
   this.route('login');
   this.route('sign-up');

diff --git a/app/routes/protected/change-password.js b/app/routes/protected/change-password.js
diff --git a/app/routes/protected/update-profile.js b/app/routes/protected/update-profile.js
diff --git a/app/templates/protected/change-password.hbs b/app/templates/protected/change-password.hbs
diff --git a/app/templates/protected/update-profile.hbs b/app/templates/protected/update-profile.hbs
diff --git a/tests/unit/routes/protected/change-password-test.js b/tests/unit/routes/protected/change-password-test.js
diff --git a/tests/unit/routes/protected/update-profile-test.js b/tests/unit/routes/protected/update-profile-test.js