Skip to content

Commit f4ea626

Browse files
committed
2 parents 59d6041 + 9edc7b3 commit f4ea626

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

.classpath

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3+
<<<<<<< HEAD
34
<classpathentry kind="src" path=""/>
45
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
6+
=======
7+
<classpathentry kind="src" path="src"/>
8+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
9+
<attributes>
10+
<attribute name="module" value="true"/>
11+
</attributes>
12+
</classpathentry>
13+
>>>>>>> branch 'master' of https://github.com/dh1010a/Java_ChessGame.git
514
<classpathentry kind="output" path="bin"/>
615
</classpath>

0 commit comments

Comments
 (0)