From 3c6f476176bbc7184c7a5fb1e94892218a50861b Mon Sep 17 00:00:00 2001 From: davigonz Date: Wed, 27 Feb 2019 12:37:04 +0100 Subject: [PATCH] Fix conflicts with master --- .../owncloud/android/lib/resources/shares/RemoteShare.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoteShare.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoteShare.java index 2a01e71a..5d340524 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoteShare.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoteShare.java @@ -51,13 +51,6 @@ public class RemoteShare implements Parcelable, Serializable { private static final String TAG = RemoteShare.class.getSimpleName(); - /** - * Generated - should be refreshed every time the class changes!! - */ - private static final long serialVersionUID = 4124975224281327921L; - - private static final String TAG = OCShare.class.getSimpleName(); - public static final int DEFAULT_PERMISSION = -1; public static final int READ_PERMISSION_FLAG = 1; public static final int UPDATE_PERMISSION_FLAG = 2;