From 9e60c0f69896959acabdb31f0649bb74f4e5b10f Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sun, 23 Sep 2001 14:01:57 +0000
Subject: [PATCH] Update TODO list.

---
 doc/TODO | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/doc/TODO b/doc/TODO
index ff2ab910f7..508ce5553b 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,10 +1,6 @@
 TODO list for PostgreSQL
 ========================
-<<<<<<< TODO
-Last updated:		Sun Sep 23 10:01:15 EDT 2001
-=======
-Last updated:		Sun Sep 23 10:01:15 EDT 2001
->>>>>>> 1.561
+Last updated:		Sun Sep 23 10:01:46 EDT 2001
 
 Current maintainer:	Bruce Momjian (pgman@candle.pha.pa.us)
 
-- 
GitLab