Package upload

[framework/uifw/elementary.git] / README

diff --git a/README b/README
index f7889e6..a165993 100644 (file)
--- a/README
+++ b/README
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-Elementary - a basic widget set that is easy to use based on EFL for mobile
-touch-screen devices.
-
-=======
 Elementary - a basic widget set library that is easy to use and is based on EFL.
 It provides the basic building blocks for creating applications and user interfaces.
 
@@ -10,4 +5,3 @@ For more details about elementary widgets and how to use them kindly refer to th
 following link.
 
 http://docs.enlightenment.org/auto/elementary/
->>>>>>> remotes/origin/upstream