fix merge issues

Signed-off-by: Andrew Whitehead <[email protected]>

Author: andrewwhitehead

.github/workflows/build.yml

@@ -278,17 +278,9 @@ jobs:
         target: [aarch64-apple-ios, aarch64-apple-ios-sim, x86_64-apple-ios]
 
     steps:
-<<<<<<< HEAD
       - name: Checkout
         uses: actions/checkout@v3
 
-=======
-      - uses: actions/checkout@v3
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> 98ed9f1 (clean up features; remove chrono dependency)
-=======
->>>>>>> 15caba5 (fix merge issues)
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@master
         with:
@@ -310,31 +302,8 @@ jobs:
       - name: Save library
         uses: actions/upload-artifact@v3
         with:
-<<<<<<< HEAD
           name: library-${{ matrix.target}}
           path: target/${{ matrix.target }}/release/libindy_vdr.dylib
-=======
-          name: ${{ matrix.architecture}}
-          path: target/${{ matrix.architecture }}/release/libindy_vdr.dylib
-<<<<<<< HEAD
-=======
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          target: ${{ matrix.architecture }}
-      - uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --release --target ${{ matrix.architecture }} --package indy-vdr
-      - name: Save library
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ matrix.architecture}}
-          path: target/${{ matrix.architecture }}/release/libindy_vdr.a
->>>>>>> 7fa12b1 (clean up features; remove chrono dependency)
->>>>>>> 98ed9f1 (clean up features; remove chrono dependency)
-=======
->>>>>>> 15caba5 (fix merge issues)
 
   create-ios-xcframework:
     name: Create iOS xcframework

wrappers/javascript/indy-vdr-react-native/src/library/NativeBindings.ts

@@ -43,13 +43,9 @@ export interface NativeBindings {
     raw?: string
     hash?: string
     enc?: string
-<<<<<<< HEAD:wrappers/javascript/indy-vdr-react-native/src/library/NativeBindings.ts
-  }): ReturnObject<RequestHandle>
-=======
     seqNo?: number
     timestamp?: number
-  }): RequestHandle
->>>>>>> 8f534e1 (quick fix for ffi bindings):wrappers/javascript/indy-vdr-shared/src/indyVdr/IndyVdrNativeBindings.ts
+  }): ReturnObject<RequestHandle>
 
   buildCredDefRequest(options: { submitterDid: string; credentialDefinition: string }): ReturnObject<RequestHandle>
 
@@ -85,16 +81,12 @@ export interface NativeBindings {
 
   buildDisableAllTxnAuthorAgreementsRequest(options: { submitterDid: string }): ReturnObject<RequestHandle>
 
-<<<<<<< HEAD:wrappers/javascript/indy-vdr-react-native/src/library/NativeBindings.ts
-  buildGetNymRequest(options: { submitterDid?: string; dest: string }): ReturnObject<RequestHandle>
-=======
   buildGetNymRequest(options: {
     submitterDid?: string
     dest: string
     didDocContent?: string
     version?: number
-  }): RequestHandle
->>>>>>> 8f534e1 (quick fix for ffi bindings):wrappers/javascript/indy-vdr-shared/src/indyVdr/IndyVdrNativeBindings.ts
+  }): ReturnObject<RequestHandle>
 
   buildGetSchemaRequest(options: { submitterDid?: string; schemaId: string }): ReturnObject<RequestHandle>