Merge branch 'master' into SWF-17-credit-health

# Conflicts: # SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard # SynchronyFinancial/SynchronyFinancial.xcodeproj/project.pbxproj
rrk12005 · Apr 9, 2019 · a2f3c9d · a2f3c9d
2 parents 5a821f7 + 99e5d21
commit a2f3c9d
Show file tree

Hide file tree

Showing 120 changed files with 15,636 additions and 240 deletions.
diff --git a/SynchronyFinancial/.swiftlint.yml b/SynchronyFinancial/.swiftlint.yml
@@ -0,0 +1,5 @@
+disabled_rules:
+  - line_length
+  - identifier_name
+excluded:
+  - Pods
diff --git a/SynchronyFinancial/Podfile.lock b/SynchronyFinancial/Podfile.lock
@@ -1,3 +1,24 @@
-PODFILE CHECKSUM: f44dd0f838ce6fa6c8b393964951c4516d14d627
+PODS:
+  - Alamofire (4.7.3)
+  - SwiftLint (0.27.0)
+  - SwiftyJSON (4.1.0)
+
+DEPENDENCIES:
+  - Alamofire
+  - SwiftLint
+  - SwiftyJSON
+
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Alamofire
+    - SwiftLint
+    - SwiftyJSON
+
+SPEC CHECKSUMS:
+  Alamofire: c7287b6e5d7da964a70935e5db17046b7fde6568
+  SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
+  SwiftyJSON: c29297daf073d2aa016295d5809cdd68045c39b3
+
+PODFILE CHECKSUM: fcb0e35ba2ebe7dfb4d3d9cadd4d9abd40038b4c
 
 COCOAPODS: 1.5.3
diff --git a/SynchronyFinancial/Pods/Alamofire/LICENSE b/SynchronyFinancial/Pods/Alamofire/LICENSE
diff --git a/SynchronyFinancial/Pods/Alamofire/README.md b/SynchronyFinancial/Pods/Alamofire/README.md