Changeset 49

Timestamp:

11/10/07 19:13:05 (10 months ago)

Author:

nlawren2

Message:

Whoops

Files:

• vowfsc/test.c (modified) (2 diffs)

vowfsc/test.c

@@ -3 +3 @@
-
-
-<<<<<<< .mine
-int main () {
-=======
-int main ()
-{
->>>>>>> .r47
-        int db_stat = db_init("localhost", 5432, "template1", "postgres", "");
-        if (db_stat) {
@@ -15 +10 @@
-        }
-        
-<<<<<<< .mine
-        printf("The dir id is: %i\n", db_get_dir_id("/foo/bar/"));
-=======
-        db_get_dir_id("/foo/bar/");
->>>>>>> .r47
-        db_destroy();
-        return 0;