# Conflicts:
#	Lighting.xcodeproj/project.pbxproj
#	Lighting/Class/Experiencecentre/Controller/ShoppingBagViewController.m
#	Podfile.lock
#	Pods/JCore/libjcore-ios-1.1.5.a
#	Pods/Manifest.lock
#	Pods/Pods.xcodeproj/project.pbxproj
#	Pods/Target Support Files/IQKeyboardManager/IQKeyboardManager.xcconfig
#	Pods/Target Support Files/Pods-Lighting_base-Lighting/Pods-Lighting_base-Lighting.debug.xcconfig
#	Pods/Target Support Files/Pods-Lighting_base-LightingDev/Pods-Lighting_base-LightingDev.release.xcconfig
#	fastlane/Fastfile
#	podfile