refs #1718 : bugfix - merge conflict

-
Needlworks · Jan 2, 2015 · c4fbc17 · c4fbc17
1 parent ef689dc
commit c4fbc17
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/framework/id/textcube/config.default.php b/framework/id/textcube/config.default.php
@@ -67,12 +67,7 @@
 $service['debug_rewrite_module'] = false;
 $service['useNumericURLonRSS'] = false;
 $service['forceinstall'] = false;
-<<<<<<< HEAD
 $service['useSSL'] = false;
 $service['cookie_prefix'] = '';
-=======
-$service['jqueryURL'] = null;	// You can change this to use external CDNs. (microsoft / google, etc..)
-$service['lodashURL'] = null;	// You can change this to use external CDNs. (microsoft / google, etc..)
->>>>>>> 40ad881...  refs #1718 : added - lo-dash library 2.4.1
 //$service['adminskin'] = 'whitedream';
 ?>