Merge branch 'master' into SWF-2-basic-ui

# Conflicts: # SynchronyFinancial/SynchronyFinancial.xcodeproj/project.pbxproj
rrk12005 · Nov 29, 2018 · ea5c6b8 · ea5c6b8
2 parents 768ee70 + 1afb768
commit ea5c6b8
Show file tree

Hide file tree

Showing 32 changed files with 1,905 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,22 @@
+# Mac OS X
+*.DS_Store
+
+# Xcode
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.model1v3
+*.mode2v3
+!default.model2v3
+*.perspectivev3
+!default.perspectivev3
+project.xcworkspace
+!default.xcworkspace
+profile
+.idea/
+*.moved-aside
 *.xcuserstate
+xcuserdata
+xcshareddata
+xcdebugger/
+
diff --git a/SynchronyFinancial/Podfile.lock b/SynchronyFinancial/Podfile.lock
@@ -0,0 +1,3 @@
+PODFILE CHECKSUM: f44dd0f838ce6fa6c8b393964951c4516d14d627
+
+COCOAPODS: 1.5.3
diff --git a/SynchronyFinancial/Pods/Manifest.lock b/SynchronyFinancial/Pods/Manifest.lock
diff --git a/SynchronyFinancial/Pods/Pods.xcodeproj/project.pbxproj b/SynchronyFinancial/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/...cuserdata/alanmaynard.xcuserdatad/xcschemes/Pods-SynchronyFinancial WatchKit App.xcscheme b/...cuserdata/alanmaynard.xcuserdatad/xcschemes/Pods-SynchronyFinancial WatchKit App.xcscheme
diff --git a/...ata/alanmaynard.xcuserdatad/xcschemes/Pods-SynchronyFinancial WatchKit Extension.xcscheme b/...ata/alanmaynard.xcuserdatad/xcschemes/Pods-SynchronyFinancial WatchKit Extension.xcscheme
diff --git a/...s.xcodeproj/xcuserdata/alanmaynard.xcuserdatad/xcschemes/Pods-SynchronyFinancial.xcscheme b/...s.xcodeproj/xcuserdata/alanmaynard.xcuserdatad/xcschemes/Pods-SynchronyFinancial.xcscheme
diff --git a/...Pods/Pods.xcodeproj/xcuserdata/alanmaynard.xcuserdatad/xcschemes/xcschememanagement.plist b/...Pods/Pods.xcodeproj/xcuserdata/alanmaynard.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/...ial WatchKit App/Pods-SynchronyFinancial WatchKit App-acknowledgements.markdown b/...ial WatchKit App/Pods-SynchronyFinancial WatchKit App-acknowledgements.markdown
diff --git a/...nchronyFinancial WatchKit App/Pods-SynchronyFinancial WatchKit App-acknowledgements.plist b/...nchronyFinancial WatchKit App/Pods-SynchronyFinancial WatchKit App-acknowledgements.plist
diff --git a/...t Files/Pods-SynchronyFinancial WatchKit App/Pods-SynchronyFinancial WatchKit App-dummy.m b/...t Files/Pods-SynchronyFinancial WatchKit App/Pods-SynchronyFinancial WatchKit App-dummy.m