From: giwoong.kim <giwoong.kim@samsung.com>
Date: Tue, 27 Mar 2012 05:58:04 +0000 (+0900)
Subject: [Title] merge pkginfo.manifest
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1728
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1501a45eb7c88b35743e51c110f08b538508f690;p=sdk%2Femulator%2Fqemu.git

[Title] merge pkginfo.manifest
[Type]
[Module] Emulator
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
---

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index cafc0888d7..db77b985b5 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,9 +1,5 @@
 Package: emulator
-<<<<<<< HEAD
-Version: 1.2.51
-=======
 Version: 1.2.53
->>>>>>> release-pre1.0
 OS: linux
 Build-host-os: linux
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
@@ -12,11 +8,7 @@ Source: emulator
 Description: Tizen Emulator
 
 Package: emulator
-<<<<<<< HEAD
-Version: 1.2.51
-=======
 Version: 1.2.53
->>>>>>> release-pre1.0
 OS: windows
 Build-host-os: windows
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>