9 lines
307 B
XML
9 lines
307 B
XML
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
<dirs>
|
|
<<<<<<< HEAD
|
|
<entry loc="/usr/lib/jvm/java-7-openjdk-amd64" stamp="1433462559000"/>
|
|
=======
|
|
<entry loc="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.31-5.b13.fc21.x86_64" stamp="1426736504000"/>
|
|
>>>>>>> e3b5f5f77f61b7a685fc1fc9109f8de395ab933d
|
|
</dirs>
|