# Conflicts:
#	Class/OrderdetailsViewController.m
#	Class/PromotionChooseViewController.m
#	Tools/opple_objc_json_client.h
#	Tools/opple_objc_json_client.m

# Conflicts:
#	Class/CardDetailsViewController.m
#	Class/CardViewController.m
#	Class/LuckyDrawViewController.m
#	Class/OrderdetailsViewController.m
#	Class/RebateViewController.m
#	Class/Tabbar/CustomTabbarController.m
#	Lighting.xcodeproj/project.pbxproj
#	Lighting/OppleMain.storyboard
#	Tools/BaseViewController.h
#	Tools/BaseViewController.m

# Conflicts:
#	Class/CustomerOrderViewController.m
#	Class/OrderdetailsViewController.h
#	Class/OrderdetailsViewController.m

# Conflicts:
#	Class/OrderdetailsViewController.m

# Conflicts:
#	Class/ClientViewController.m
#	Class/ClientdetailsViewController.m
#	Class/OrderdetailsViewController.m
#	Lighting/OppleMain.storyboard
#	Tools/BaseViewController.h