fix confict

.gitignore

@@ -18,5 +18,7 @@ bom_server
 .DS_Store
 cmd/cmd.exe
 cmd/move/logs/
+cmd/bom_sync
+server/bom_server
 /cmd/dong/logs/*.log
 /sh

pull_bom_server.bash

 #!/bin/bash
 cd /data2/gocode/bom_server
 git pull origin master
-rm ./cmd/scm_wms_sync
-rm ./sh/import_source
 rm ./conf/config.ini
 mv ./conf/config_production.ini ./conf/config.ini
 go build -o ./cmd/bom_sync ./cmd/main.go
-go build -o ./server/bom_rpc_server ./server/main.go
-supervisorctl restart scm:bom_server
\ No newline at end of file
+go build -o ./server/bom_server ./server/main.go
+supervisorctl restart bom:bom_server
\ No newline at end of file