diff --git a/README.md b/README.md index ab63117..d77e3f2 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,12 @@
+<<<<<<< HEAD
The free of influence
+=======
+ The free from influence
+
+>>>>>>> Added icon and screenshots
This is a simple, beautiful XMPP/Jabber client for Android.