Fix rebase issues

realm · Jan 3, 2020 · 0912be3 · 0912be3
1 parent 0e29a6d
commit 0912be3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -123,11 +123,6 @@
   expressions.  
   [PaulTaykalo](https://github.com/PaulTaykalo)
   [#2918](https://github.com/realm/SwiftLint/issues/2918)
-
-* Add new indentation opt-in-rule checking for
-  basic additive indentation pattern.  
-  [Frederick Pietschmann](https://github.com/fredpi)
-  [#227](https://github.com/realm/SwiftLint/issues/227)
 
 * Speed up syntax token lookups, which can improve performance when
   linting large files.  
@@ -1013,7 +1008,10 @@ This is the last release to support building with Swift 4.0 and Swift 4.1.
 
 #### Enhancements
 
-* None.
+* Add new indentation opt-in-rule checking for
+  basic additive indentation pattern.  
+  [Frederick Pietschmann](https://github.com/fredpi)
+  [#227](https://github.com/realm/SwiftLint/issues/227)
 
 #### Bug Fixes
 

diff --git a/Source/SwiftLintFramework/Rules/Style/IndentationWidthRule.swift b/Source/SwiftLintFramework/Rules/Style/IndentationWidthRule.swift
@@ -46,7 +46,7 @@ public struct IndentationWidthRule: ConfigurationProviderRule, OptInRule {
     public init() {}
 
     // MARK: - Methods: Validation
-    public func validate(file: File) -> [StyleViolation] { // swiftlint:disable:this function_body_length
+    public func validate(file: SwiftLintFile) -> [StyleViolation] { // swiftlint:disable:this function_body_length
         var violations: [StyleViolation] = []
         var previousLineIndentations: [Indentation] = []