Daniel Metzing
|
cf64c0873b
|
Merge branch 'attibute_and_modifier_order' into upstream_master
# Conflicts:
# Cartfile
# Cartfile.private
# Cartfile.resolved
# Carthage/Checkouts/SourceKitten
# Package.resolved
# Package.swift
# Rules.md
# Source/SwiftLintFramework/Extensions/Configuration+LintableFiles.swift
# Source/SwiftLintFramework/Extensions/Dictionary+SwiftLint.swift
# Source/SwiftLintFramework/Models/SwiftVersion.swift
# Source/SwiftLintFramework/Rules/ModifiersOrderRule.swift
# Source/SwiftLintFramework/Rules/RuleConfigurations/ModifiersOrderConfiguration.swift
# SwiftLint.xcodeproj/project.pbxproj
# Tests/SwiftLintFrameworkTests/LinterCacheTests.swift
# Tests/SwiftLintFrameworkTests/ModifiersOrderTests.swift
# circle.yml
|
2018-04-10 23:04:11 +02:00 |
|