From 60261de80b6fc15f121c361a277c22a3ae09640d Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 13 Feb 2001 20:54:51 +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 6e3efe93154..4fe5f7107a6 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,10 +1,6 @@
 TODO list for PostgreSQL
 ========================
-<<<<<<< TODO
-Last updated:		Tue Feb 13 15:53:36 EST 2001
-=======
-Last updated:		Tue Feb 13 15:53:36 EST 2001
->>>>>>> 1.378
+Last updated:		Tue Feb 13 15:54:29 EST 2001
 
 Current maintainer:	Bruce Momjian (pgman@candle.pha.pa.us)
 
-- 
GitLab