From 91ac400452b3da90c541c01a5345a5956f54a903 Mon Sep 17 00:00:00 2001
From: Matan Bar Yosef <baryosef.matan@gmail.com>
Date: Fri, 26 Jun 2015 16:58:55 +0300
Subject: [PATCH] Merge branch 'master' of https://github.com/sagidayan/SE-Hub
 into UI

# Conflicts:
#	templates/js/services/apiService.js
---
 templates/js/services/apiService.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/templates/js/services/apiService.js b/templates/js/services/apiService.js
index 6c351e3..56a40c0 100644
--- a/templates/js/services/apiService.js
+++ b/templates/js/services/apiService.js
@@ -99,8 +99,6 @@ service.factory('apiService', ['$http', function($http) {
 			};
 			return $http(req);
 		},
-		getCampusesByUser: function(token){
-			var url =  (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/courses/getCampusesByUser/" + token;
 		getCampusesByUser: function(token){
 			var url =  (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/campuses/getCampusesByUser/" + token;
 			req = {