Skip to content

I
InstiApp
Commit 39ff7dfc authored by mayu's avatar mayu
Browse files
Options

Merge remote-tracking branch 'upstream/master' 

# Conflicts:
#	app/src/main/res/layout/fragment_my_events.xml
parent 57243f72
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
app/src/main/res/layout/fragment_my_events.xml
View file @ 39ff7dfc
...@@ -26,6 +26,5 @@ ...@@ -26,6 +26,5 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_margin="16dp" android:layout_margin="16dp"
android:src="@android:drawable/ic_input_add" android:src="@android:drawable/ic_input_add"
<<<<<<< HEAD
android:tint="@android:color/black" /> android:tint="@android:color/black" />
</RelativeLayout> </RelativeLayout>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment