update

6caf39ef · wanliofficial · 48af3786 · 6caf39ef
Commit 6caf39ef authored Jun 22, 2021 by wanliofficial
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 9 deletions

backend/start.sh backend/start.sh +0 -9

No files found.
--- a/backend/start.sh
+++ b/backend/start.sh
 #!/usr/bin/env bash

-<<<<<<< HEAD
-
-Cur_Dir=$(pwd)
-
-source venv/bin/activate
-nohup ${Cur_Dir}/venv/bin/python3 ${Cur_Dir}/start.py > runoob.log 2>&1 &
-
-=======
 Cur_Dir=$(pwd)

 source venv/bin/activate
 nohup ${Cur_Dir}/venv/bin/python3 ${Cur_Dir}/start.py > runoob.log 2>&1 &
->>>>>>> 735d39eb4d0c3134b62bf4fe1b7a2ca0ea8da1ca