fixed mess after merge

conf/machine/microzed.conf

@@ -5,21 +5,10 @@
 
 require conf/machine/include/tune-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
-<<<<<<< HEAD
 
 # Corresponding from linux-xlnx and ezynq-u-boot
 PREFERRED_VERSION_linux-xlnx = "3.10%"
 PREFERRED_VERSION_ezynq-u-boot = "v2013.01%"
-=======
-
-LINUX_VERSION = "3.10"
-
-# Corresponding from linux-xlnx and ezynq-u-boot
-
-PREFERRED_VERSION_ezynq-u-boot = "v2013.01%"
-PREFERRED_PROVIDER_virtual/kernel = "linux-xlnx"
-PREFERRED_VERSION_linux-xlnx = "3.10%"
->>>>>>> 772ca92533ec8b3afb28c43f9fc0df764372683f
 
 # microzed machine definition known by ezynq and xilinx u-boot
 UBOOT_MACHINE = "zynq_microzed_config"

recipes-kernel/linux/linux-xlnx_3.10.bbappend

@@ -6,16 +6,5 @@ SRC_URI_append += " file://vsc3304.patch"
 
 # Kernel version and SRCREV correspond to: 
 # github.com/Xilinx/linux-xlnx.git xilinx-v14.7 tag 
-<<<<<<< HEAD
 SRCREV = "efc27505715e64526653f35274717c0fc56491e3"
-
-#FILESEXTRAPATHS_append := "${@get_additional_bbpath_filespath('conf/machine/boards:', d)}"
-=======
 LINUX_VERSION = "3.10"
-SRCREV = "efc27505715e64526653f35274717c0fc56491e3"
-
-#inherit xilinx-utils
-#FILESEXTRAPATHS_append := "${@get_additional_bbpath_filespath('conf/machine/boards:', d)}"
-
-#OOT_KERNEL_DEVICETREE_append := "${@expand_dir_basepaths_by_extension("MACHINE_DEVICETREE", os.path.join(d.getVar("WORKDIR", True), 'devicetree'), '.dts', d)}"
->>>>>>> 772ca92533ec8b3afb28c43f9fc0df764372683f