one more merge fix

530f9049 · Oleg Dzhimiev · 7a802596 · 530f9049
Commit 530f9049 authored Dec 08, 2013 by Oleg Dzhimiev
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

machine-xilinx-default.inc conf/machine/include/machine-xilinx-default.inc +1 -1

No files found.
--- a/conf/machine/include/machine-xilinx-default.inc
+++ b/conf/machine/include/machine-xilinx-default.inc
@@ -8,7 +8,7 @@ IMAGE_CLASSES += "image_types_uboot"
 # Kernel Configuration
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx"
 PREFERRED_VERSION_linux-xlnx ?= "3.10%"
-<<<<<<< HEAD
+

 # U-Boot Configuration
 #PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx"