Commit 353a767

committed

fix git conflict

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

1 parent 4084442 commit 353a767Copy full SHA for 353a767

3 files changed

+1307

-3

lines changed

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

3 files changed

+1307

-3

lines changed

Comments

(0)