add

deployment/test.ini

@@ -1,5 +1,8 @@
 [program:test]
+<<<<<<< HEAD
 environment = CONFIG_NAME="qcloud"
+=======
+>>>>>>> e196dadc1dc4388e56f07c7720b4fba32d75c300
 directory = /root/project/test/project/
 command = /usr/bin/gunicorn -c deployment/gunicorn.conf views:app
 stdout_logfile = /data/log/web/test.sup.log