fix merge bug

@@ -32,12 +32,11 @@ module.exports = {
     },
     },
     useCache: false,
     useCache: false,
     memcache: {
     memcache: {
-        master: ['192.168.102.205:12111'],
-        slave: ['192.168.102.205:12111'],
-        session: ['192.168.102.205:12111'],
-        retries: 0,
-        reconnect: 5000,
-        timeout: 1000
+        master: ['192.168.102.168:12111'],
+        slave: ['192.168.102.168:12111'],
+        session: ['192.168.102.168:12111'],
+        timeout: 1000,
+        retries: 0
     },
     },
     interfaceShunt: {
     interfaceShunt: {
         open: false
         open: false

@@ -182,8 +182,7 @@ function reMarginFooter(fixedElement) {
     $footer.removeClass('hide');
     $footer.removeClass('hide');
 }());
 }());
 
 
-
-(function(w, d, s, j, f) { // eslint-disable-line
+(function(w, d, s, j, f) {
     var a = d.createElement(s);
     var a = d.createElement(s);
     var m = d.getElementsByTagName(s)[0];
     var m = d.getElementsByTagName(s)[0];
 
 
@@ -196,12 +195,7 @@ function reMarginFooter(fixedElement) {
     a.async = 1;
     a.async = 1;
     a.src = j;
     a.src = j;
     m.parentNode.insertBefore(a, m);
     m.parentNode.insertBefore(a, m);
-<<<<<<< HEAD
-})(window, document, 'script', (document.location.protocol === 'https:' ? 'https' : 'http') + '://' + // eslint-disable-line
-    'cdn.yoho.cn/yas-jssdk/1.0.17/yas.js', '_yas'); // eslint-disable-line
-=======
 })(window, document, 'script', (document.location.protocol === 'https:' ? 'https' : 'http') + '://cdn.yoho.cn/yas-jssdk/1.0.17/yas.js', '_yas');
 })(window, document, 'script', (document.location.protocol === 'https:' ? 'https' : 'http') + '://cdn.yoho.cn/yas-jssdk/1.0.17/yas.js', '_yas');
->>>>>>> master
 
 
 (function() {
 (function() {
     var uid = getUid();
     var uid = getUid();