update

conf.d/payapi.xinyue.conf

@@ -21,7 +21,11 @@ server {
 
     charset utf-8;
 
+<<<<<<< HEAD
     server_name h5pay.xinyuepage.com h5pay.xinyueapi.com xpay1.weile.com xpay2.weile.com xpay3.weile.com h5pay.xinyueyouxi.com payapi.xinyueyouxi.com payback.xinyueyouxi.com xpay1.xinyueyouxi.com xpay2.xinyueyouxi.com xpay3.xinyueyouxi.com ipay.xinyueapi.com ipay.88xinnian.com ap.88xinnian.com xpay3.xinyuesite.com xpay1.xinyuesite.com xpay2.xinyuesite.com;
+=======
+    server_name order.xinyuesite.com order.xinyueapps.com order.xinyuepage.com h5pay.xinyuepage.com h5pay.xinyueapi.com xpay1.weile.com xpay2.weile.com xpay3.weile.com h5pay.xinyueyouxi.com payapi.xinyueyouxi.com payback.xinyueyouxi.com xpay1.xinyueyouxi.com xpay2.xinyueyouxi.com xpay3.xinyueyouxi.com ipay.xinyueapi.com ipay.88xinnian.com ap.88xinnian.com xpay3.xinyuesite.com;
+>>>>>>> 55ef89979b5e2d22c8deaaca1fdc8ff53876caba
 
     location / {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;