diff options
| author | Matias Niemelä | 2013-06-05 18:12:00 -0400 |
|---|---|---|
| committer | Misko Hevery | 2013-06-06 22:06:50 -0700 |
| commit | 9faabd1ba0b1929785bcf166dc0ff60008e7c442 (patch) | |
| tree | 53412b42b9276cd7d5c679c65ea065d3679c6b77 /src/AngularPublic.js | |
| parent | 65f5e856a161e7c91b9ebde1360242dc704d0510 (diff) | |
| download | angular.js-9faabd1ba0b1929785bcf166dc0ff60008e7c442.tar.bz2 | |
chore(AngularPublic): remove angular.noConflict feature
Diffstat (limited to 'src/AngularPublic.js')
| -rwxr-xr-x | src/AngularPublic.js | 3 |
1 files changed, 1 insertions, 2 deletions
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); |