fix bug hermet added in font code! :)

[framework/uifw/elementary.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 78441b8..f730d9e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -101,32 +101,15 @@ tags
 /po/remove-potcdate.sin
 /po/stamp-po
 /doc/Doxyfile
-/src/examples/actionslider_example_01
-<<<<<<< HEAD
-/doc/widget_preview_button1
-/doc/widget_preview_button2
-/doc/widget_preview_button3
-/config.guess.cdbs-orig
-/config.sub.cdbs-orig
-/config/slp/base.cfg
-/debian/files
-/debian/*.log
-/debian/*.substvars
-/debian/libelm-bin/
-/debian/libelm-dbg/
-/debian/libelm-dev/
-/debian/*.debhelper
-/debian/libelm/
-/debian/stamp-*
-/debian/tmp/
-=======
 /doc/widget_preview_*
 /doc/widgets/widget_preview_*
+src/examples/actionslider_example_01
 src/examples/bg_example_01
 src/examples/bg_example_02
 src/examples/bg_example_03
 src/examples/box_example_02
 src/examples/bubble_example_01
+src/examples/button_example_00
 src/examples/button_example_01
 src/examples/calendar_example_01
 src/examples/calendar_example_02
@@ -213,4 +196,16 @@ src/examples/transit_example_04
 src/examples/web_example
 src/examples/win_example
 src/examples/dayselector_example
->>>>>>> remotes/origin/upstream
+/config.guess.cdbs-orig
+/config.sub.cdbs-orig
+/config/slp/base.cfg
+/debian/files
+/debian/*.log
+/debian/*.substvars
+/debian/libelm-bin/
+/debian/libelm-dbg/
+/debian/libelm-dev/
+/debian/*.debhelper
+/debian/libelm/
+/debian/stamp-*
+/debian/tmp/