# HG changeset patch
# User hamidouk
# Date 1323264659 -3600
# Node ID b14a1a83ebc1700bd3371ce0780d4dd51e64c6a8
# Parent  d62a52c4bfa8d3853cbae90da968555942387213
removed noConflict feature.

diff -r d62a52c4bfa8 -r b14a1a83ebc1 src/js/init.js
--- a/src/js/init.js	Wed Dec 07 12:36:08 2011 +0100
+++ b/src/js/init.js	Wed Dec 07 14:30:59 2011 +0100
@@ -27,7 +27,7 @@
         break;
         
       case "jwplayer":
-          Popcorn.noConflict(); /* remove current popcorn instance */
+          // Popcorn.noConflict(true); /* remove current popcorn instance */
           Popcorn = PopcornReplacement;
           var opts = IriSP.jQuery.extend({}, options);
           delete opts.container;