merged from Samuel

Ellert Smári · Ellert Smári · commit eced5dba3098 · 2015-11-30T13:02:30.000Z
diff --git a/angular/index.html b/angular/index.html
@@ -9,10 +9,6 @@
     <script src="https://code.angularjs.org/1.2.28/angular-route.min.js"></script>
   </head>
   <body ng-app="HomeApp">
-<<<<<<< HEAD
-
-=======
->>>>>>> 60bafdeaa84601825b49a2d36a5bca66ebc74e40
     <nav class="navbar navbar-default" role="navigation">
         <div class="navbar-header">
             <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
@@ -28,7 +24,7 @@
                 <li><a href="#">Home</a></li>
                 <li><a href="#/ucp">UCP</a></li>
                     <ul class="dropdown-menu">
-                      <!--Links hedwadawdawdawddw-->
+                      <!--Links her-->
                     </ul>
                 </li>
             </ul>
@@ -80,6 +76,5 @@
     <script src="js/controllers/RegisterController.js"></script>
     <!-- Services -->
     <script src="js/services/directory.js"></script>
->>>>>>> 60bafdeaa84601825b49a2d36a5bca66ebc74e40
   </body>
 </html>
diff --git a/angular/js/app.js b/angular/js/app.js
@@ -2,11 +2,7 @@ var app = angular.module('HomeApp', ['ngRoute']);
 
 app.config(['$routeProvider', function($routeProvider) {
  $routeProvider
-<<<<<<< HEAD
-.when('/Home', {
-=======
  .when('/Home', {
->>>>>>> 60bafdeaa84601825b49a2d36a5bca66ebc74e40
    controller: 'TopicController',
    templateUrl: 'views/home.html'
  })
diff --git a/forum/db.sqlite3 b/forum/db.sqlite3
