mirror of
				https://github.com/owncloud/android-library.git
				synced 2025-11-04 12:28:25 +00:00 
			
		
		
		
	Fix conflicts with master
This commit is contained in:
		
							parent
							
								
									0b3c8a7bf8
								
							
						
					
					
						commit
						3c6f476176
					
				@ -51,13 +51,6 @@ public class RemoteShare implements Parcelable, Serializable {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    private static final String TAG = RemoteShare.class.getSimpleName();
 | 
					    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 DEFAULT_PERMISSION = -1;
 | 
				
			||||||
    public static final int READ_PERMISSION_FLAG = 1;
 | 
					    public static final int READ_PERMISSION_FLAG = 1;
 | 
				
			||||||
    public static final int UPDATE_PERMISSION_FLAG = 2;
 | 
					    public static final int UPDATE_PERMISSION_FLAG = 2;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user