summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglenda <glenda@ln.inri.net>2011-11-26 22:53:00 -0600
committerglenda <glenda@ln.inri.net>2011-11-26 22:53:00 -0600
commitc45d7ed1a2b3d3b7233a25f1d8a154a85dd85b00 (patch)
treefd62f53414bde8b64b4d8f7c32195fa85d3b959e
parentb5bdb7a94b56f7eec86733729468c463a1b2f815 (diff)
downloadplan9front-c45d7ed1a2b3d3b7233a25f1d8a154a85dd85b00.tar.xz
fortunes: fix
-rw-r--r--sys/games/lib/fortunes3
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/games/lib/fortunes b/sys/games/lib/fortunes
index af21b3343..f26d0d381 100644
--- a/sys/games/lib/fortunes
+++ b/sys/games/lib/fortunes
@@ -4637,7 +4637,6 @@ I installed Microsoft Windows 95 on my laptop which already had Plan9 9 happily
Additional Facts:
``Open Systems'' is a command like ``Open Sesame'': it means they want you to open your wallet. -- Geoff Collyer
Upas owes much of its design and success to Sendmail.
-<<<<<<< local
If you discover that you are riding a dead horse, dismount.
Verbatim copying and distribution of this entire article are permitted in any medium provided this notice is preserved.
If you quit on school, you're not just quitting on yourself, you're quitting on your country. -- President Barack Obama
@@ -4648,5 +4647,3 @@ And I don't want to live between such men, as you are.
Yes, asshole. -- Douglas A. Gwyn
Everything you do from now on will be more fun. -- Windows 95 installer
Subject: Do you think I can use Plan9 ?
-=======
->>>>>>> other