From 1bac7acdc0e57f7d430d7fa6f79478811db38b6f Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Sun, 16 May 2004 13:19:41 +0000
Subject: [PATCH] r9375: fix conflicted merge

---
 TODO | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/TODO b/TODO
index c373914..2dcbf4c 100644
--- a/TODO
+++ b/TODO
@@ -11,37 +11,11 @@ TESTS TO ADD
 
 COMMONSQL INCOMPATIBILITY
 
-<<<<<<< .mine
-  o Complete sql expressions (see operations.lisp)
-
-      nvl (Oracle specific) 
-      userenv (Oracle specific) 
-      minus (Oracle specific: does the same as EXCEPT) 
-      || 
-
-=======
->>>>>>> .r9364
    o variables (e.g., table identifiers) should be instantiated at runtime 
-
-<<<<<<< .mine
-=======
- >> The functional sql interface 
-  
-    SELECT 
-      o keyword arg :refresh should function as advertised 
-
- >> Symbolic SQL syntax 
-
-      o userenv (Oracle specific but deprecated in Oracle 9) 
+   o userenv (Oracle specific but deprecated in Oracle 9) 
 
 VARIANCES FROM COMMONSQL
 
-UPDATE-OBJECT-JOINS:
- Rather than simply reading the values for each
- object, to meet CommonSQL spec need to generate a single
- query to read values for all objects, up to max-len count.
-
->>>>>>> .r9364
 COMMIT,ROLLBACK,START-TRANSACTION: 
  When COMMIT or ROLLBACK are called outside of WITH-TRANSACTION, an sql 
  transaction must be explicitly started first with START-TRANSACTION. 
-- 
2.34.1