From 6b315baf52a1e2c354272a6950f35b1cdaa08afa Mon Sep 17 00:00:00 2001 From: Kitae Kim Date: Fri, 17 Feb 2012 17:30:36 +0900 Subject: [PATCH] [Title] resolve merge conflicts [Type] git [Module] emulator-kernel [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- package/pkginfo.manifest | 8 -------- 1 file changed, 8 deletions(-) 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 @@ -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 -- 2.34.1