From deb58c1c55963db223f3edc03c68c0a73c642265 Mon Sep 17 00:00:00 2001
From: 49bitquant <49bitquant@gmail.com>
Date: Fri, 26 Nov 2021 21:41:09 +0100
Subject: [PATCH] change the readme file.

---
 README.md | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/README.md b/README.md
index 9d4819d..531a103 100644
--- a/README.md
+++ b/README.md
@@ -89,12 +89,7 @@ configuration, then save the file.
 - scp scp binance_grid_trader.zip ubuntu@xxx.xxx.xxx.xxx:/home/ubuntu
 - pwd 
 - mv  #  移动或者剪切文件
-<<<<<<< HEAD
 - sh stop.sh # 杀死当前进程
-=======
-- ps -ef | grep main.py    # 查看进程
-- kill 进程id  # 杀死当前进程
->>>>>>> 4ce7af6e47f522c34438dca7b7653c6f985d6927
 
 ## 部署
 直接把代码上传到服务器, 通过scp命令上传
@@ -117,16 +112,8 @@ configuration, then save the file.
 执行运行脚本
 > sh start.sh 
 
-<<<<<<< HEAD
 杀死进程, 关闭程序
 > sh stop.sh 
-=======
-查看程序运行的id
-> ps -ef | grep main.py
-
-杀死进程, 关闭程序
-> kill <进程ID> 
->>>>>>> 4ce7af6e47f522c34438dca7b7653c6f985d6927
 
 **linux服务器指令和网格策略实盘部署过程如下**
 [https://www.bilibili.com/video/BV1mK411n7JW/](https://www.bilibili.com/video/BV1mK411n7JW/)
@@ -139,9 +126,3 @@ configuration, then save the file.
 可以添加我的微信，如果你有什么量化问题、python学习、课程咨询等方面的问题，都可以咨询我。
 
 ![51bitquant个人微信](https://upload-images.jianshu.io/upload_images/814550-f83c8302f2c4e344.jpg?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240)
-<<<<<<< HEAD
-=======
-
-
-
->>>>>>> 4ce7af6e47f522c34438dca7b7653c6f985d6927