Fix rebase issues

CHANGELOG.md

@@ -18,6 +18,12 @@
   details: https://github.com/realm/SwiftLint/pull/3123  
   [JP Simard](https://github.com/jpsim)
   [#3116](https://github.com/realm/SwiftLint/issues/3116)
+
+* Add option to specify a `child_config` / `parent_config` file
+  (local or remote) in any SwiftLint configuration file.
+  Allow passing multiple configuration files via the command line.  
+  [Frederick Pietschmann](https://github.com/fredpi)
+  [#1352](https://github.com/realm/SwiftLint/issues/1352)
 
 #### Bug Fixes
 
@@ -78,12 +84,6 @@
 * Add `deinitializer` type content to `type_contents_order` rule instead of
   grouping it with initializers.  
   [Steven Magdy](https://github.com/StevenMagdy)
-
-* Add option to specify a `child_config` / `parent_config` file
-  (local or remote) in any SwiftLint configuration file.
-  Allow passing multiple configuration files via the command line.  
-  [Frederick Pietschmann](https://github.com/fredpi)
-  [#1352](https://github.com/realm/SwiftLint/issues/1352)
 
 * Inline test failure messages to make development of SwiftLint easier. Test
   failures in triggering and non-triggering examples will appear inline in

Tests/SwiftLintFrameworkTests/ConfigurationTests.swift

@@ -213,14 +213,8 @@ class ConfigurationTests: XCTestCase, ProjectMock {
         let filenames = paths.map { $0.bridge().lastPathComponent }.sorted()
         let expectedFilenames = [
             "DirectoryLevel1.swift",
-            "Level0.swift",
-            "Level1.swift",
-            "Level2.swift",
-            "Level3.swift",
-            "Valid1.swift",
-            "Valid2.swift",
-            "Main.swift",
-            "Sub.swift"
+            "Level0.swift", "Level1.swift", "Level2.swift", "Level3.swift",
+            "Valid1.swift", "Valid2.swift", "Main.swift", "Sub.swift"
         ]
 
         XCTAssertEqual(Set(expectedFilenames), Set(filenames))
@@ -315,7 +309,8 @@ class ConfigurationTests: XCTestCase, ProjectMock {
     }
 
     func testAllowZeroLintableFiles() {
-        let configuration = Configuration(dict: ["allow_zero_lintable_files": true])!
+        // swiftlint:disable:next force_try
+        let configuration = try! Configuration(dict: ["allow_zero_lintable_files": true])
         XCTAssertTrue(configuration.allowZeroLintableFiles)
     }
 }