Merge OLPC changes

[wiki.git] / OneLaptopPerChild.rej

diff --git a/OneLaptopPerChild.rej b/OneLaptopPerChild.rej
deleted file mode 100644 (file)
index 4191f90..0000000
--- a/OneLaptopPerChild.rej
+++ /dev/null
@@ -1,19 +0,0 @@
-***************
-*** 41,48 ****
-  
-  ----
-  
-- **Due to questionable decisions made by our top-management, at this time I cannot fully endorse OLPC**
-  
-- OneWindozePerChild.png
-  
-- Instead, I'm working on [[SugarLabs]].
---- 41,48 ----
-  
-  ----
-  
-+ **Due to unclear and questionable decisions made by our top-management, at this time I cannot fully endorse OLPC**
-  
-+ {{OneWindozePerChild.png}}
-  
-+ Instead, I'm working on the [[SugarLabs]] foundation.