oopsy in dynloader.c

*** dynloader.c.old    Thu Jul 22 16:29:46 1999
--- dynloader.c    Thu Jul 22 16:30:23 1999
***************
*** 1,6 **** /* Dummy file used for nothing at this point  *
- <<<<<<< linux.c  * see sunos4.h =======  * dynloader.c
--- 1,5 ----
***************
*** 16,25 ****  *      $Header: /usr/local/cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.15 1999/07/17 20:17:31
momjianExp $  *  *-------------------------------------------------------------------------
 
- >>>>>>> 1.15  */
- <<<<<<< linux.c
- =======  #include "postgres.h" #ifdef HAVE_DLD_H
--- 15,21 ----
***************
*** 114,117 **** }  #endif
- >>>>>>> 1.15
--- 110,112 ----


=== END OF PATCH
-- 
Mark Hollomon
mhh@mindspring.com