Merge remote-tracking branch 'remotes/origin/upstream'

[framework/uifw/elementary.git] / data / objects / test.edc

diff --git a/data/objects/test.edc b/data/objects/test.edc
index a485230..3bfeccc 100644 (file)
--- a/data/objects/test.edc
+++ b/data/objects/test.edc
@@ -770,6 +770,10 @@ collections {
                   relative: 0.7 340/400;
                   to: "bg";
                }
+<<<<<<< HEAD
+=======
+               align: 0.5 0.0;
+>>>>>>> remotes/origin/upstream
             }
          }
          part { name: "btn1_bottom_padding";