diff options
| author | stefan-niedermann <info@niedermann.it> | 2019-03-11 20:34:12 +0300 |
|---|---|---|
| committer | stefan-niedermann <info@niedermann.it> | 2019-03-11 20:34:12 +0300 |
| commit | caf59197c718541b3d62b3182bbef027051972b1 (patch) | |
| tree | 52228aa11eadf492a3bcea7cd6604b88639bad09 /app/src/main/java/it/niedermann/nextcloud/deck/model/Permission.java | |
| parent | 373211e40462e58fffc84035ef24d3171f116846 (diff) | |
| parent | 785143550b3486007d46da88f9a8477aee8589a9 (diff) | |
Merge remote-tracking branch 'origin/edit' into edit
# Conflicts:
# app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java
# app/src/main/res/layout/activity_edit.xml
# app/src/main/res/layout/fragment_card_edit_tab_details.xml
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/model/Permission.java')
| -rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/model/Permission.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Permission.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Permission.java index 8407bb4a5..6f742152d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Permission.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Permission.java @@ -1,7 +1,7 @@ package it.niedermann.nextcloud.deck.model; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.PrimaryKey; +import androidx.room.Entity; +import androidx.room.PrimaryKey; import it.niedermann.nextcloud.deck.model.enums.PermissionType; |