Fixed incomplete merge conflict

Author: Joshua Baert

src/components/home/homeCtrl.js

@@ -41,14 +41,10 @@ angular.module('app').controller('homeCtrl', function($scope, $state, mainServic
 
     $scope.getUserKatas = (userid) => {
         mainService.getUserKatas(userid).then(response => {
-<<<<<<< HEAD
             $scope.userKatas = response.data;
-=======
-             $scope.userKatas = response.data;
-             console.log($scope.userKatas);
->>>>>>> master
+
         })
-    }
+    };
 
     $scope.voteKata = (kataid, vote) => { // the vote is a true or false value
         mainService.voteKata(mainService.user.id, kataid, vote).then(response => {