From 4095909280b219c9dbdae3af9b81311080fe6b20 Mon Sep 17 00:00:00 2001
From: Nicolas Bornand <nicolas74@gmail.com>
Date: Sat, 10 May 2014 18:46:00 +0200
Subject: add path service

---
 app/js/controllers.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/js/controllers.js b/app/js/controllers.js
index 1c6e8d0..b592990 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -3,7 +3,6 @@
 /* Controllers */
 var p = new Point(1,2);
 
-<<<<<<< HEAD
 app.controller('pointCtrl', ['$scope', '$http', function($scope, $http){
 	var constList = [
 		{x: 10, y:20},
-- 
cgit v1.2.3