Conflicts:
	lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
	spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb