ref: c45d7ed1a2b3d3b7233a25f1d8a154a85dd85b00
parent: b5bdb7a94b56f7eec86733729468c463a1b2f815
author: glenda <[email protected]>
date: Sat Nov 26 17:53:00 EST 2011
fortunes: fix
--- a/sys/games/lib/fortunes
+++ b/sys/games/lib/fortunes
@@ -4637,7 +4637,6 @@
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 @@
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