Fix merge conflict
This commit is contained in:
		
							parent
							
								
									622a1245dc
								
							
						
					
					
						commit
						c059b83f2b
					
				| @ -123,8 +123,6 @@ | ||||
|                 android:id="@+id/button_layout" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="wrap_content" | ||||
|                 android:layout_alignParentEnd="true" | ||||
|                 android:layout_alignParentRight="true" | ||||
|                 android:layout_below="@id/icon" | ||||
|                 android:layout_toEndOf="@id/icon" | ||||
|                 android:layout_toRightOf="@id/icon" | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 mvp76
						mvp76