Merge remote-tracking branch 'upstream/master'

[friendica.git] / view / theme / decaf-mobile / templates / end.tpl

diff --git a/view/theme/decaf-mobile/templates/end.tpl b/view/theme/decaf-mobile/templates/end.tpl
index 6914cfd246e3a63c5a5cf6444bad2c3a368ac3f9..b072de33f28dd16b734c272e630c8fc55a32ed64 100644 (file)
--- a/view/theme/decaf-mobile/templates/end.tpl
+++ b/view/theme/decaf-mobile/templates/end.tpl
@@ -11,7 +11,6 @@
   tinyMCE.init({ mode : "none"});
 </script>-->*}}
 {{*<!--<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.divgrow-1.3.1.f1.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/fk.autocomplete.js" ></script>-->*}}
@@ -25,6 +24,5 @@
 <script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/theme.js"></script>
 
 <!--<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.package.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/decaf-mobile.package.js" ></script>-->