aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout/fragment_conversation.xml
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-06 19:42:55 +0100
committerlookshe <github@lookshe.org>2016-03-06 19:42:55 +0100
commit3c400703e082a1b180b35d891b8fb3460c7d5b87 (patch)
tree28738dd90fc41b4ab71897f38d324828778ad2e3 /src/main/res/layout/fragment_conversation.xml
parent72114d732427266024cdd6e27cd8d1aa60afae2f (diff)
parentf28d77dc42f6bac5a026e0b1c78562dee8de45ac (diff)
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'src/main/res/layout/fragment_conversation.xml')
-rw-r--r--src/main/res/layout/fragment_conversation.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index e70e9a05..c3a86616 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -4,7 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/grey200">
+ android:background="@color/grey200" >
<com.orangegangsters.github.swipyrefreshlayout.library.SwipyRefreshLayout
android:layout_width="fill_parent"
@@ -27,7 +27,7 @@
android:listSelector="@android:color/transparent"
android:stackFromBottom="true"
android:transcriptMode="normal"
- tools:listitem="@layout/message_sent" >
+ tools:listitem="@layout/message_sent">
</ListView>
</com.orangegangsters.github.swipyrefreshlayout.library.SwipyRefreshLayout>