diff options
| author | Nicolas Bornand <nicolas74@gmail.com> | 2014-05-10 18:46:00 +0200 |
|---|---|---|
| committer | Nicolas Bornand <nicolas74@gmail.com> | 2014-05-10 18:46:00 +0200 |
| commit | 4095909280b219c9dbdae3af9b81311080fe6b20 (patch) | |
| tree | a1b1816fb84f3601fb6eaac4fa157c3c5b6f9894 | |
| parent | d3d8d0c03d710bddf4a5d7b971597fdce52c43c7 (diff) | |
| download | playGraph-4095909280b219c9dbdae3af9b81311080fe6b20.tar.gz playGraph-4095909280b219c9dbdae3af9b81311080fe6b20.tar.bz2 playGraph-4095909280b219c9dbdae3af9b81311080fe6b20.zip | |
add path service
| -rw-r--r-- | app/js/controllers.js | 1 |
1 files changed, 0 insertions, 1 deletions
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}, |