test1.xml 0000644 0000765 0000765 00000001142 10716545626 012260 0 ustar tcurdt tcurdt
<<<<<<< HEAD:testdata/test.xml
=======
as
>>>>>>> 75cb63ff7005344589b57d17338b64783f8f430c:testdata/test.xml
1521
10.248.40.111
JDBC
false
appsrv
Dev-DB
O10gIN1
oracle.jdbc.driver.OracleDriver
thin
test2.xml 0000644 0000765 0000765 00000000122 10716545626 012256 0 ustar tcurdt tcurdt
Hello, world!