diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-02 21:03:25 +0100 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-02 21:03:25 +0100 |
| commit | dde482df6492e874ffb30c3c5127e620c418c57b (patch) | |
| tree | c140423cc3d396a8a3507496b392894cbe47fecf /client/js/controllers/network/main.js | |
| parent | 6ce1bbc7be91aa6441c3ff168a734ed25479eb72 (diff) | |
| parent | 85222e1246b3805100428717874d15aafd682d26 (diff) | |
Correct conflicts
Diffstat (limited to 'client/js/controllers/network/main.js')
| -rw-r--r-- | client/js/controllers/network/main.js | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/client/js/controllers/network/main.js b/client/js/controllers/network/main.js deleted file mode 100644 index 7264aec..0000000 --- a/client/js/controllers/network/main.js +++ /dev/null @@ -1,8 +0,0 @@ -/** - * The network controller - * - * @param {$scope} $scope The $scope service from angular - */ -mainApp.controller('networkCtrl', function ($scope) -{ -});
\ No newline at end of file |