Resolve conflicts

[irspy-moved-to-github.git] / MANIFEST

diff --git a/MANIFEST b/MANIFEST
index 0143eb8..2b37dc9 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,15 +1,17 @@
-Changes
-MANIFEST
-MANIFEST.SKIP
-META.yml
-Makefile.PL
-README
-bin/Makefile
+bin/irspy-dump.pl
+bin/irspy-nagios.pl
+bin/irspy-rewrite-records.pl
 bin/irspy-stats.pl
-bin/irspy.pl
+bin/irspy-update.sh
+bin/irspy-xpath.pl
 bin/irspy-xsltproc.pl
+bin/irspy.pl
+bin/Makefile
 bin/reindex.pl
 bin/setrlimit.c
+Changes
+etc/dallas.rules
+etc/irspy-px
 lib/ZOOM/IRSpy.pm
 lib/ZOOM/IRSpy/Connection.pm
 lib/ZOOM/IRSpy/Maintenance.pod
@@ -26,27 +28,36 @@ lib/ZOOM/IRSpy/Test/Ping.pm
 lib/ZOOM/IRSpy/Test/Quick.pm
 lib/ZOOM/IRSpy/Test/Record/Fetch.pm
 lib/ZOOM/IRSpy/Test/Record/Main.pm
+lib/ZOOM/IRSpy/Test/Record/OPAC.pm
+lib/ZOOM/IRSpy/Test/Record/PiggyBack.pm
 lib/ZOOM/IRSpy/Test/ResultSet/Main.pm
 lib/ZOOM/IRSpy/Test/ResultSet/Named.pm
+lib/ZOOM/IRSpy/Test/Search/Bath.pm
 lib/ZOOM/IRSpy/Test/Search/Bib1.pm
 lib/ZOOM/IRSpy/Test/Search/Boolean.pm
 lib/ZOOM/IRSpy/Test/Search/CQL.pm
-lib/ZOOM/IRSpy/Test/Search/DBDate.pm
 lib/ZOOM/IRSpy/Test/Search/Dan1.pm
+lib/ZOOM/IRSpy/Test/Search/DBDate.pm
 lib/ZOOM/IRSpy/Test/Search/Explain.pm
 lib/ZOOM/IRSpy/Test/Search/Main.pm
 lib/ZOOM/IRSpy/Test/Search/Title.pm
 lib/ZOOM/IRSpy/Utils.pm
 lib/ZOOM/IRSpy/Web.pm
 lib/ZOOM/IRSpy/WebService.pod
+Makefile.PL
+MANIFEST
+MANIFEST.SKIP
+META.yml
+README
 t/ZOOM-IRSpy.t
+web/conf/apache2.0/irspy.conf
 web/conf/README
+web/htdocs/add_target.html
 web/htdocs/admin/all.html
 web/htdocs/admin/check.html
 web/htdocs/admin/delete.html
 web/htdocs/admin/edit.html
 web/htdocs/admin/index.html
-web/htdocs/admin/upload.html
 web/htdocs/ap.html
 web/htdocs/beach.jpeg
 web/htdocs/chrome/layout.mc
@@ -78,6 +89,7 @@ web/htdocs/help/edit/contact.html
 web/htdocs/help/edit/country.html
 web/htdocs/help/edit/dbname.html
 web/htdocs/help/edit/description.html
+web/htdocs/help/edit/disabled.html
 web/htdocs/help/edit/extent.html
 web/htdocs/help/edit/history.html
 web/htdocs/help/edit/host.html
@@ -97,25 +109,27 @@ web/htdocs/help/info/reliability.html
 web/htdocs/help/link.mc
 web/htdocs/index.html
 web/htdocs/raw.html
+web/htdocs/robots.txt
 web/htdocs/software.html
 web/htdocs/stats.html
 web/htdocs/style.css
+web/htdocs/upload.html
 web/htdocs/valid-xhtml10.png
 web/htdocs/vcss.png
-web/images/Makefile
 web/images/help.xcf
+web/images/Makefile
 xsl/irspy2zeerex.xsl
 xsl/use-attr-names.xml
-zebra/Makefile
-zebra/README
 zebra/crontab
 zebra/ezeerex2pqfproperties.pl
 zebra/filterconf.xml
 zebra/form.html
 zebra/htpasswd
 zebra/init-script
+zebra/Makefile
 zebra/pqf.properties
 zebra/profile
+zebra/README
 zebra/yazserver.xml
 zebra/zebra.cfg
 zebra/zeerex-2.0.xsd