yaffs Fixed a git merge conflict.

Signed-off-by: Timothy Manning <tfhmanning@gmail.com>

diff --cc logo/README.txt
index a746693413c751726b2e1aff04b74802e1b50ce2,f4b1c2ef4354fd0afa5165989fd7a0a4c7b4e93d..ba1e5df85a78d54395b72db7dc166894c89a8424
--- 1/logo/README.txt
--- 2/logo/README.txt
+++ b/logo/README.txt
@@@ -1,18 -1,15 +1,15 @@@
  README -for YAFFS logo
  
  
 -There are two different logos created. They were both created by Blender.
 -There is a logo without textured legs which uses texture_1.png
 -and a logo with textured legs which uses chip_uv_tex2.tga
 +there are 3 different logos created. They were created by Blender.
 +There is a logo_without_textured_legs which uses texture_1.png 
 +-- a very simple chip to be used for very small black and white images.
  
 -Blender uses absolute paths for imported texture files. This means that the
 -textures need to reloaded into blender. For more infomation on how to do
 -this please see the blender online tutorials. 
 +There is also a logo_with_textured_legs_and_white_background which uses chip_uv_tex.png
 +-- A chip with textured legs on a highlighted white plane.
 +
 +Finally there is logo_with_textured_legs_alpha which uses chip_uv_tex2.tga
 +-- This is the only logo which has a transparent background.
  
 -The pictures generated by these files have yet to be up loaded to
 -the YAFFS source control.
  
- The pictures generated by these files have yet to be up loaded to
- the YAFFS source control.
- 
  -Timothy Manning 04/10/2010