Rebase

Author: Luc Dion

LayoutFrameworkBenchmark.xcodeproj/xcshareddata/xcschemes/LayoutFrameworkBenchmark.xcscheme

@@ -28,16 +28,6 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "DF337CCC20D1831D0035DECF"
-               BuildableName = "LayoutFrameworkBenchmarkTests-iOS.xctest"
-               BlueprintName = "LayoutFrameworkBenchmarkTests-iOS"
-               ReferencedContainer = "container:LayoutFrameworkBenchmark.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference

Podfile.lock

@@ -1,68 +1,36 @@
 PODS:
-<<<<<<< HEAD
   - FlexLayout (1.3.9)
   - LayoutKit (8.0.1)
   - NKFrameLayoutKit (2.1)
   - NotAutoLayout (3.1.1)
   - PinLayout (1.7.9)
   - Reveal-SDK (16)
-=======
-  - FlexLayout (1.3.6)
-  - LayoutKit (7.0.2)
-  - Nimble (7.1.2)
-  - NotAutoLayout (3.1.1)
-  - PinLayout (1.7.8)
-  - Quick (1.3.0)
-  - Reveal-SDK (10)
->>>>>>> Initial commit
 
 DEPENDENCIES:
   - FlexLayout
   - LayoutKit
-<<<<<<< HEAD
   - NKFrameLayoutKit
-=======
-  - Nimble
->>>>>>> Initial commit
   - NotAutoLayout
   - PinLayout
-  - Quick
-  - Reveal-SDK (~> 10)
+  - Reveal-SDK
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - FlexLayout
     - LayoutKit
-<<<<<<< HEAD
     - NKFrameLayoutKit
-=======
-    - Nimble
->>>>>>> Initial commit
     - NotAutoLayout
     - PinLayout
-    - Quick
     - Reveal-SDK
 
 SPEC CHECKSUMS:
-<<<<<<< HEAD
   FlexLayout: dbe4b2da72ee63d7145cf32bb5bfba375aeeb9e6
   LayoutKit: dab1c2eea7a0bf9d8d755a8a793f87a929768455
   NKFrameLayoutKit: 6a2f6ac34f85d495e683ea0f7f1605903a4d3e00
   NotAutoLayout: 2e6e82146dcb556cb61fcfd638b202639c167e84
   PinLayout: 21ce87a865407a7a3c8a38a326611c476095fedf
   Reveal-SDK: ed36bdbb3cbf90b94ae5da0dbcb3c7ae6738c51f
 
-PODFILE CHECKSUM: 2cdc011667a7f9e27a997f01bc1401d8830f418d
-=======
-  FlexLayout: bcdde388eaf826cfb6f801c8a507e2dca70412fa
-  LayoutKit: 183c513f8322f4e22321499e54163864bcdf7d97
-  Nimble: 3835ba9f459daa6b347f8a8e110aaae8ca1920a8
-  NotAutoLayout: 2e6e82146dcb556cb61fcfd638b202639c167e84
-  PinLayout: 2baeb56058fcbc600e4a39146868d78f998b0e1f
-  Quick: 03278013f71aa05fe9ecabc94fbcc6835f1ee76f
-  Reveal-SDK: 7869ddf1f902cabbb07a1f0dd06bd25861a126f7
-
-PODFILE CHECKSUM: 8dfce0b8ca416f33319615ec6b0853028e3d147a
->>>>>>> Initial commit
+PODFILE CHECKSUM: 7f58ddd1b9687b031aeb33d986faeaf19ed0e225
 
 COCOAPODS: 1.5.3