yaffs Fixed a git merge conflict.

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

diff --git a/NANDFailureMitigation.odt b/NANDFailureMitigation.odt
new file mode 100644 (file)
index 0000000..6cab29b
Binary files /dev/null and b/NANDFailureMitigation.odt differ

diff --git a/YaffsFaq.odt b/YaffsFaq.odt
index 62f946d12b210ed2b2687fb3b01a0594cc936bf3..613ab82d847ffdf4ddb7aad4bef2056c56475e83 100644 (file)
Binary files a/YaffsFaq.odt and b/YaffsFaq.odt differ

diff --git a/logo/README.txt b/logo/README.txt
index a746693413c751726b2e1aff04b74802e1b50ce2..ba1e5df85a78d54395b72db7dc166894c89a8424 100644 (file)
--- a/logo/README.txt
+++ b/logo/README.txt
@@ -12,7 +12,4 @@ 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.
-
 -Timothy Manning 04/10/2010