qmx
/
qfw


			
				
					
						
						
							12345678910111213141516171819202122232425
							[1mdiff --cc core/src/timetask.json[m
[1mindex 0eba9db,8be7bc9..0000000[m
[1m--- a/core/src/timetask.json[m
[1m+++ b/core/src/timetask.json[m
[36m@@@ -1,1 -1,1 +1,5 @@@[m
[31m- {"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-28 09:39:35"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-28 09:39:35"}},"marketisstart":true,"marketrate":300}[m
[31m -{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-28 12:54:36"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-28 12:54:36"}},"marketisstart":true,"marketrate":300}[m
[32m++<<<<<<< HEAD[m
[32m++{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-28 09:39:35"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-28 09:39:35"}},"marketisstart":true,"marketrate":300}[m
[32m++=======[m
[32m++{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-28 12:54:36"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-28 12:54:36"}},"marketisstart":true,"marketrate":300}[m
[32m++>>>>>>> e697f24fdd22cbe16dc2ce282d2d1689a6e445a7[m
[1mdiff --git a/common/src/qfw/util/sq/sq.go b/common/src/qfw/util/sq/sq.go[m
[1mindex 96ac697..11e2d32 100644[m
[1m--- a/common/src/qfw/util/sq/sq.go[m
[1m+++ b/common/src/qfw/util/sq/sq.go[m
[36m@@ -13,7 +13,7 @@[m [mimport ([m
 const key string = "qmx20150708one_versionV1.0"[m
 [m
 func init() {[m
[31m-	CheckSq()[m
[32m+[m	[32m//CheckSq()[m
 }[m
 [m
 func CheckSq() bool {[m