Fix issues after rebase

realm · Dec 11, 2018 · 74ac67b · 74ac67b
1 parent 12f960a
commit 74ac67b
Show file tree

Hide file tree

Showing 8 changed files with 440 additions and 632 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -296,6 +296,15 @@ This is the last release to support building with Swift 4.0 and Swift 4.1.
   `compiler_protocol_init` rule.  
   [Timofey Solonin](https://github.com/biboran)
   [#2422](https://github.com/realm/SwiftLint/issues/2422)
+* Add new opt-in rule `file_types_order` to specify how the types in a file
+  should be sorted.  
+  [Cihat Gündüz](https://github.com/Dschee)
+  [#2294](https://github.com/realm/SwiftLint/issues/2294)
+
+* Add new opt-in rule `type_contents_order` to specify the order of subtypes,
+  properties, methods & more within a type.  
+  [Cihat Gündüz](https://github.com/Dschee)
+  [#2294](https://github.com/realm/SwiftLint/issues/2294)
 
 #### Bug Fixes
 
@@ -754,15 +763,7 @@ The next release will require Swift 4.0 or higher to build.
 
 #### Enhancements
 
-* Add new opt-in rule `file_types_order` to specify how the types in a file
-  should be sorted.  
-  [Cihat Gündüz](https://github.com/Dschee)
-  [#2294](https://github.com/realm/SwiftLint/issues/2294)
-
-* Add new opt-in rule `type_contents_order` to specify the order of subtypes,
-  properties, methods & more within a type.  
-  [Cihat Gündüz](https://github.com/Dschee)
-  [#2294](https://github.com/realm/SwiftLint/issues/2294)
+* None.
 
 #### Bug Fixes