9 months ago · 611e7f821c
--- a/bin/jl_tg_config_back.pid
+++ b/bin/jl_tg_config_back.pid
@@ -1,9 +0,0 @@
 
				-<<<<<<< HEAD
			
 
				-16657
			
 
				-=======
			
 
				-<<<<<<< HEAD
			
 
				-21288
			
 
				-=======
			
 
				-16380
			
 
				->>>>>>> 2b0ac85fbaac2f6e6921f321581e36814a080de3
			
 
				->>>>>>> d15a0e1697267a88c393d258d570b11f10bc39f2