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/Angular.js | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'src/Angular.js')

diff --git a/src/Angular.js b/src/Angular.js
index 952e7a1d..c9b6d530 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -63,24 +63,6 @@ var /** holds major version number for IE or NaN for real browsers */
     nodeName_,
     uid               = ['0', '0', '0'];
 
-/**
- * @ngdoc function
- * @name angular.noConflict
- * @function
- *
- * @description
- * Restores the previous global value of angular and returns the current instance. Other libraries may already use the
- * angular namespace. Or a previous version of angular is already loaded on the page. In these cases you may want to
- * restore the previous namespace and keep a reference to angular.
- *
- * @return {Object} The current angular namespace
- */
-function noConflict() {
-  var a = window.angular;
-  window.angular = _angular;
-  return a;
-}
-
 /**
  * @private
  * @param {*} obj
-- 
cgit v1.2.3