# 删除冗余log
# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

# 秀出冗余log
# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

hi