From 1f31e7ddea0139ae1f49edad0c475d097987bdf9 Mon Sep 17 00:00:00 2001
From: Greg Beaver <cellog@php.net>
Date: Sat, 29 May 2004 08:48:01 +0000
Subject: [PATCH] new package.xml needed to test conflicting files error

---
 pear/tests/test-pkg6/conflictpackage.xml | 35 ++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pear/tests/test-pkg6/conflictpackage.xml

diff --git a/pear/tests/test-pkg6/conflictpackage.xml b/pear/tests/test-pkg6/conflictpackage.xml
new file mode 100644
index 0000000000..ee99a03886
--- /dev/null
+++ b/pear/tests/test-pkg6/conflictpackage.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+    <!DOCTYPE package SYSTEM "http://pear.php.net/dtd/package-1.0">
+    <package version="1.0">
+      <name>pkg6conflict</name>
+      <summary>required test for PEAR_Installer</summary>
+      <description>
+        fake package
+      </description>
+      <license>PHP License</license>
+      <maintainers>
+        <maintainer>
+          <user>fakeuser</user>
+          <name>Joe Shmoe</name>
+          <email>nobody@example.com</email>
+          <role>lead</role>
+        </maintainer>
+      </maintainers>
+      <release>
+        <version>1.1</version>
+        <date>2003-09-09</date>
+        <state>stable</state>
+        <notes>
+			required dependency test
+        </notes>
+        <filelist>
+          <dir name="/" baseinstalldir="groob" role="php">
+            <file>zoorb1.php</file>
+            <dir name="goompness" role="php">
+              <file>oggbrzitzkee.php</file>
+              <file>Mopreeb.php</file>
+            </dir>
+          </dir>
+        </filelist>
+      </release>
+   </package>
-- 
2.50.1