summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2006-04-20 22:35:44 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2006-04-20 22:35:44 +0000
commitc84882868fdb431ae872e3874744525321f1c553 (patch)
tree0c3412d8cca34c28aa10917a36da382414132fde
parent7f4f51691c65ccda0b842af5908456b0f5803399 (diff)
Fix typos.
-rw-r--r--ChangeLog3
1 files changed, 0 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ff94be8..d9cce3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,6 @@
* VERSION: Updated to network-demos-4.6.99.2.
-<<<<<<< ChangeLog
2003-09-18 Joel Sherrill <joel@OARcorp.com>
PR 493/networking
@@ -22,7 +21,6 @@
* VERSION: Updated to network-demos-4.6.0pre1.
-=======
2003-09-18 Jay Monkman <jtm@smoothsmoothie.com>
PR 494/networking
@@ -49,7 +47,6 @@
* VERSION: Updated to network-demos-4.6.0pre1.
->>>>>>> 1.8.2.4
2003-01-28 Joel Sherrill <joel@OARcorp.com>
* VERSION: Updated to network-demos-20030128.