# 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/PaymentsViewController.m
#	Class/ProductDetailsViewController.m
#	Class/ProductLibraryViewController.m
#	Class/RebateDetailsViewController.m
#	Class/RebateViewController.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
#	Class/WithdrawalViewController.m
#	Lighting.xcodeproj/project.pbxproj
#	Lighting/Base.lproj/LaunchScreen.storyboard
#	Lighting/Images.xcassets/00启动页.imageset/00启动页.jpg
#	Lighting/Images.xcassets/Brand Assets.launchimage/Contents.json
#	Pods/Target Support Files/Pods/Pods-dummy.m
#	Pods/Target Support Files/Pods/Pods.debug.xcconfig
#	Pods/Target Support Files/Pods/Pods.release.xcconfig
#	Tools/BaseViewController.m
#	Tools/LoadingView/XBLoadingView.h
#	Tools/LoadingView/XBLoadingView.m
#	Tools/NetworkRequestClassManager.h
#	Tools/NetworkRequestClassManager.m
#	Tools/PrefixHeader.pch
#	Tools/SceneViewController.m
#	Tools/ShoppingBagViewController.m