From: Kitae Kim <kt920.kim@samsung.com>
Date: Fri, 17 Feb 2012 08:30:36 +0000 (+0900)
Subject: [Title] resolve merge conflicts
X-Git-Tag: 2.2.1_release^2~170
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b315baf52a1e2c354272a6950f35b1cdaa08afa;p=sdk%2Femulator%2Femulator-kernel.git

[Title] resolve merge conflicts
[Type] git
[Module] emulator-kernel
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
---

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 315ceeeffcda..278f141cd2d4 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,9 +1,5 @@
 Package: emulator-kernel
-<<<<<<< HEAD
 Version: 1.1.3
-=======
-Version: 1.1.2
->>>>>>> 948357da2b9653867fcb8bc18a482fa95d5a577c
 OS: linux
 Build-host-os: linux
 Maintainer: Yeong-Kyoon, Lee <yeongkyoon.lee@samsung.com>
@@ -11,11 +7,7 @@ Source: emulator-kernel
 Description: Tizen Emulator Kernel
 
 Package: emulator-kernel
-<<<<<<< HEAD
 Version: 1.1.3
-=======
-Version: 1.1.2
->>>>>>> 948357da2b9653867fcb8bc18a482fa95d5a577c
 OS: windows
 Build-host-os: linux
 Maintainer: Yeong-Kyoon, Lee <yeongkyoon.lee@samsung.com>