call and exorcist for this cvs server, please

SVN revision: 4036

debian/changelog

@@ -1,8 +1,4 @@
-<<<<<<< changelog
 e17 (0.1.0-2000112500) unstable; urgency=low
-=======
-libedb1 (1.0.2-0.2000122401) unstable; urgency=low
->>>>>>> 1.3
 
   * a cvs release
 

debian/control

@@ -1,47 +1,12 @@
-<<<<<<< control
 Source: e17
 Section: x11
-=======
-Source: libedb1
-Section: libs
->>>>>>> 1.4
 Priority: optional
 Maintainer: Laurence J. Lane <ljlane@debian.org>
-<<<<<<< control
-Standards-Version: 3.2.0.1
-=======
 Standards-Version: 3.2.1.0
->>>>>>> 1.4
 
-<<<<<<< control
 Package: e17
 Section: x11
-=======
-Package: libedb1
-Section: libs
->>>>>>> 1.4
 Architecture: any
-<<<<<<< control
 Depends: ${shlibs:Depends}
 Description: e17 description
  e17 extended description
-=======
-Conflicts: libedb0, libedba1
-Replaces: libedb0, libedba1
-Provides: libedb0, libedba1
-Depends: ${shlibs:Depends}
-Description: Enlightenment's db convenience wrapper library
- Enlightenment's db convenience wrapper library
-
-Package: libedb1-dev
-Architecture: any
-Section: devel
-Conflicts: libedb-dev, libedba-dev
-Replaces: libedb-dev, libedba-dev
-Provides: libedb-dev, libedba-dev
-Depends: libedb1 (= ${Source-Version}), libc6-dev
-Description: Enlightenment's db convenience wrapper library.
- Library and header files for developing programs that use
- Enlightenment's db convenience wrapper library
-
->>>>>>> 1.4

debian/files

@@ -1 +0,0 @@
-e17_0.1.0-2000112500_i386.deb x11 optional