Skip to content

Commit bc28145

Browse files
committed
Cleanup
1 parent 2debf92 commit bc28145

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

ClassicComponentsExample/Data Detectors/BarcodeScannerDemo/ScanAndCountResultsViewController.swift

-4
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@ class ScanAndCountResultsViewController: UIViewController {
2727
let destination = segue.destination as? BarcodeResultDetailsViewController,
2828
let selectedBarcode = self.selectedBarcode {
2929
destination.barcodeImage = selectedBarcode.sourceImage?.toUIImage()
30-
<<<<<<< HEAD
3130
destination.barcodeText = selectedBarcode.displayText
32-
=======
33-
destination.barcodeText = selectedBarcode.textWithExtension
34-
>>>>>>> afe7b88 (Update examples)
3531
}
3632
}
3733
}

DataCaptureRTUUIExample/Usecases/Data Detect Usecases/UsecaseScanLicensePlate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class UsecaseScanLicensePlate: Usecase, SBSDKUILicensePlateScannerViewController
2727
}
2828

2929
func licensePlateScanner(_ controller: SBSDKUILicensePlateScannerViewController,
30-
didRecognizeLicensePlate result: SBSDKLicensePlateScannerResult) {
30+
didScanLicensePlate result: SBSDKLicensePlateScannerResult) {
3131
guard result.validationSuccessful else {
3232
return
3333
}

0 commit comments

Comments
 (0)