aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2001-09-23 14:01:57 +0000
committerBruce Momjian <bruce@momjian.us>2001-09-23 14:01:57 +0000
commit9e60c0f69896959acabdb31f0649bb74f4e5b10f (patch)
tree3dd399308b591e3e8bffd5ed02260f658e217975
parent6aa7738524071dd2aff4380d3c93e22fe5163b45 (diff)
downloadpostgresql-9e60c0f69896959acabdb31f0649bb74f4e5b10f.tar.gz
postgresql-9e60c0f69896959acabdb31f0649bb74f4e5b10f.zip
Update TODO list.
-rw-r--r--doc/TODO6
1 files changed, 1 insertions, 5 deletions
diff --git a/doc/TODO b/doc/TODO
index ff2ab910f7e..508ce5553b2 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)