Commit 2391368

committed

fix git conflict

Signed-off-by: alperozturk <[email protected]>

1 parent 4e7699d commit 2391368Copy full SHA for 2391368

4 files changed

+1221

-3

lines changed

app
- schemas/com.nextcloud.client.database.NextcloudDatabase
  - 95.json
- src/main/java/com
  - nextcloud/client/database
    - NextcloudDatabase.kt
    - entity
      - CapabilityEntity.kt
  - owncloud/android/db
    - ProviderMeta.java

4 files changed

+1221

-3

lines changed

Comments

(0)