# Conflicts:
#	Class/AllCustomerViewController.m
#	Class/CardBeenUseViewController.m
#	Class/CardDontUseViewController.m
#	Class/CardViewController.m
#	Class/ChangePasswordViewController.m
#	Class/ClientShoppingCarViewController.m
#	Class/ClientViewController.m
#	Class/CustomerOrderViewController.m
#	Class/Login/LoginViewController.m
#	Class/LuckyDrawDetailsViewController.m
#	Class/OrderRecordViewController.m
#	Class/OrderdetailsViewController.m
#	Class/ProductDetailsViewController.m
#	Class/ProductLibraryViewController.m
#	Class/SceneLibraryViewController.m
#	Class/SearchViewController.m
#	Class/SettlementViewController.m
#	Class/Shoppingcart/AddressViewController.m
#	Class/Shoppingcart/GenerateOrdersViewController.m
#	Class/Shoppingcart/ShoppingViewController.m
#	Class/UserViewController.m
#	Lighting.xcodeproj/project.pbxproj
#	Tools/BaseViewController.h
#	Tools/BaseViewController.m
#	Tools/CustomWKWebViewController.m
#	Tools/NetworkRequestClassManager.m
#	Tools/PrefixHeader.pch
#	Tools/SceneViewController.m
#	Tools/ShoppingBagViewController.m
#	Tools/opple_objc_json_client.h
#	Tools/opple_objc_json_client.m

# Conflicts:
#	Class/CardViewController.m