diff --git a/Pods/Pods.xcodeproj/xcuserdata/okechi.xcuserdatad/xcschemes/xcschememanagement.plist b/Pods/Pods.xcodeproj/xcuserdata/okechi.xcuserdatad/xcschemes/xcschememanagement.plist index 2b8c429..871efb0 100644 --- a/Pods/Pods.xcodeproj/xcuserdata/okechi.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Pods/Pods.xcodeproj/xcuserdata/okechi.xcuserdatad/xcschemes/xcschememanagement.plist @@ -127,6 +127,11 @@ SuppressBuildableAutocreation + 0D52FE07CEB8B5458F3C73BB37A484FB + + primary + + 0FF38C485BD8E73F614C919F834D6EAB primary @@ -147,6 +152,11 @@ primary + 21020CCDF572876803FA95BD48270386 + + primary + + 2AA2F4091B94E46EEE3AD6055CB49C7D primary @@ -157,6 +167,11 @@ primary + 31CABCBBC4853F0A3523D99FE6D41F17 + + primary + + 3C34098A7DACA89F52BF902062730F50 primary @@ -182,6 +197,11 @@ primary + 66B6577A34875C54541830039899A97A + + primary + + 6E31B4FD268BEE6936B4477E4EDCD609 primary @@ -212,6 +232,11 @@ primary + 9AAFED731A7D62458AD19F177724048B + + primary + + 9D0F2E5EA1B46A5D72FFD42B0B39DBBC primary diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate index 1e52f65..e607a40 100644 Binary files a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate and b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 3f72b01..dbb800b 100644 --- a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -280,7 +280,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Kroleo/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift" - timestampString = "506444138.580552" + timestampString = "506445306.333072" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "32" @@ -295,7 +295,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Kroleo/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift" - timestampString = "506444138.580651" + timestampString = "506445306.333167" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "32" @@ -310,7 +310,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Kroleo/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift" - timestampString = "506444138.580732" + timestampString = "506445306.33325" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "32" @@ -325,7 +325,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Kroleo/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift" - timestampString = "506444138.580811" + timestampString = "506445306.333388" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "32" @@ -341,462 +341,6 @@ shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" -<<<<<<< HEAD -<<<<<<< HEAD - filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "501292645.293697" - startingColumnNumber = "9223372036854775807" - endingColumnNumber = "9223372036854775807" - startingLineNumber = "617" - endingLineNumber = "617" - landmarkName = "publishItem(_:)" - landmarkType = "5"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >>>>>> master landmarkType = "5"> @@ -814,127 +357,6 @@ shouldBeEnabled = "No" ignoreCount = "0" continueAfterRunningActions = "No" -<<<<<<< HEAD - filePath = "Vendoo/EtsyRESTAPIManager.swift" - timestampString = "500945314.687625" - startingColumnNumber = "9223372036854775807" - endingColumnNumber = "9223372036854775807" - startingLineNumber = "680" - endingLineNumber = "680" - landmarkName = "sendPOSTRequest(_:body:onCompletion:)" - landmarkType = "5"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - >>>>>> master landmarkType = "5"> - - - - >>>>>> master -======= shouldBeEnabled = "No" ignoreCount = "0" continueAfterRunningActions = "No" ->>>>>>> master filePath = "Vendoo/ItemTableViewController.swift" timestampString = "506441897.665422" startingColumnNumber = "9223372036854775807" @@ -1261,7 +658,7 @@ - - - - - - - - - - - - - - - - - - - - - - >>>>>> master -======= filePath = "Vendoo/NetworkCollectionViewCell.swift" timestampString = "506443799.616654" ->>>>>>> master startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "16" @@ -1642,13 +933,61 @@ shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "Vendoo/MenuPanelViewController.swift" - timestampString = "501441064.896937" + filePath = "Vendoo/EbayWebServiceManager.swift" + timestampString = "506445239.649442" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "116" - endingLineNumber = "116" - landmarkName = "tableView(_:cellForRowAtIndexPath:)" + startingLineNumber = "468" + endingLineNumber = "468" + landmarkName = "parser(_:foundCharacters:)" + landmarkType = "5"> + + + + + + + + + + + +