framework.js in edifice-1.3.0

- old
+ new

@@ -3,11 +3,9 @@
   * @author Tom Coleman
   * @author Zoltan Olah
   * @author Joe Dollard
   */
 
-jQuery.noConflict();
-
 /** 
   @name $.fn 
   @namespace
   @description jQuery Plugins
 */