Handle conflicts from git merge release-20160315

diff --cc packaging/mic.spec
index 52a271f,08fecc4..b0607f2
--- 1/packaging/mic.spec
--- 2/packaging/mic.spec
+++ b/packaging/mic.spec
@@@ -49,60 -54,7 +54,6 @@@ is used to create images with differen
  convert an image to a specified type; subcommand chroot is used to chroot into
  an image.
  
- %package native
- Summary:    Native support for mic
- Requires:   util-linux
- Requires:   coreutils
- Requires:   psmisc
- Requires:   e2fsprogs
- Requires:   dosfstools >= 2.11
- Requires:   kpartx
- Requires:   parted
- Requires:   device-mapper
- Requires:   syslinux >= 3.82
- %if ! 0%{?suse_version}
- Requires:   syslinux-extlinux >= 3.82
- %endif
- 
- %if 0%{?suse_version} || 0%{?tizen_version:1}
- Requires:   squashfs >= 4.0
- Requires:   python-m2crypto
- %else
- Requires:   python-libs
- Requires:   squashfs-tools >= 4.0
- Requires:   m2crypto
- %endif
- 
- %if 0%{?suse_version} || 0%{?tizen_version:1}
- Requires:   /usr/bin/qemu-arm
- %else
- Requires:   qemu-arm-static
- %endif
- 
- %if ! 0%{?tizen_version:1}
- Requires:   isomd5sum
- Requires:   /usr/bin/genisoimage
- %endif
- 
- Requires:   yum >= 3.2.24
- %if 0%{?tizen_version:1}
- Requires:   python-zypp
- %else
- Requires:   python-zypp-tizen
- %endif
- 
- Requires:   mic
- 
- #%if 0%{?suse_version}
- #Requires:   btrfsprogs
- #%else
- #Requires:   btrfs-progs
- #%endif
- 
- %description native
- The native support package for mic, it includes all requirements
- for mic native running.
--
  %prep
  %setup -q -n %{name}-%{version}