[Title] Removed changelog

diff --git a/package/changelog b/package/changelog
index 0fda7f1..786bd19 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -9,13 +9,6 @@
 - [develop] Added build config action set
 - [develop] Check to exist GBS tool
 == donghyuk.yang <donghyuk.yang@samsung.com> 2012-12-18
-* 1.0.29
-- Added property tab for GBS Options
-- Removed Sample tab from project wizard
-- Added build config action set
-- Check to exist GBS tool
->>>>>>> develop
-== donghyuk.yang <donghyuk.yang@samsung.com> 2012-12-17
 * 1.0.31
 - Removed launch menu of Package Manager
 == donghyuk.yang <donghyuk.yang@samsung.com> 2012-12-05