[FE training-materials-updates] Fix mismerge

[Alexandre Belloni]

Repository : git://git.free-electrons.com/training-materials.git

On branch  : master
Link       : http://git.free-electrons.com/training-materials/commit/?id=6d472c96fe8e5d347eec2a9a0eeb2f5024d1306e

>---------------------------------------------------------------

commit 6d472c96fe8e5d347eec2a9a0eeb2f5024d1306e
Author: Alexandre Belloni <alexandre.belloni at free-electrons.com>
Date:   Wed Jul 30 18:37:10 2014 +0200

    Fix mismerge
    
    Signed-off-by: Alexandre Belloni <alexandre.belloni at free-electrons.com>


>---------------------------------------------------------------

6d472c96fe8e5d347eec2a9a0eeb2f5024d1306e
 .../sysdev-flash-filesystems.tex                   |    9 ---------
 1 file changed, 9 deletions(-)

diff --git a/labs/sysdev-flash-filesystems/sysdev-flash-filesystems.tex b/labs/sysdev-flash-filesystems/sysdev-flash-filesystems.tex
index 2af5415..ce35960 100644
--- a/labs/sysdev-flash-filesystems/sysdev-flash-filesystems.tex
+++ b/labs/sysdev-flash-filesystems/sysdev-flash-filesystems.tex
@@ -71,17 +71,8 @@ remaining size of the flash, from 0x660000 to the end. Remember that
 you can look at U-Boot booting messages to find what the size of
 the NAND flash is.
 
-<<<<<<< HEAD
-Before flashing JFFS2 images, make sure they will be flashed during
-the software ECC scheme, by running the \code{nandecc sw} command in
-U-Boot.
-
-Using the \code{tftp} command, download the uImage and DTB files.
-Store them in flash at the correct location.
-=======
 Using the \code{tftp} command, download and flash the new kernel
 image at the correct location.
->>>>>>> sysdev-xplained
 
 Using the \code{tftp} command, download and flash the JFFS2 image
 of the root filesystem the correct location.