From 9faabd1ba0b1929785bcf166dc0ff60008e7c442 Mon Sep 17 00:00:00 2001
From: Matias Niemelä
Date: Wed, 5 Jun 2013 18:12:00 -0400
Subject: chore(AngularPublic): remove angular.noConflict feature

---
 src/AngularPublic.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/AngularPublic.js')

diff --git a/src/AngularPublic.js b/src/AngularPublic.js
index 8330c067..53ad5aab 100755
--- a/src/AngularPublic.js
+++ b/src/AngularPublic.js
@@ -48,8 +48,7 @@ function publishExternalAPI(angular){
     'isDate': isDate,
     'lowercase': lowercase,
     'uppercase': uppercase,
-    'callbacks': {counter: 0},
-    'noConflict': noConflict
+    'callbacks': {counter: 0}
   });
 
   angularModule = setupModuleLoader(window);
-- 
cgit v1.2.3