Skip to content
Snippets Groups Projects
Commit 6a8daaf2 authored by MasterPyo's avatar MasterPyo
Browse files

fix merge

parent d6bbacdf
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 9 deletions
MavenChess/.idea/misc.xml
+ 1
− 1
View file @ 6a8daaf2
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_20" default="true" project-jdk-name="openjdk-20" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="openjdk-20" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>
\ No newline at end of file
MavenChess/.idea/modules.xml deleted 100644 → 0
+ 0
− 8
View file @ d6bbacdf
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/MavenChess.iml" filepath="$PROJECT_DIR$/.idea/MavenChess.iml" />
</modules>
</component>
</project>
\ No newline at end of file
MavenChess/MavenChess/target/classes/view/BoardView.class
+ 0
− 0
View file @ 6a8daaf2
No preview for this file type
MavenChess/MavenChess/target/classes/view/Custom3dModel.class
+ 0
− 0
View file @ 6a8daaf2
No preview for this file type
MavenChess/MavenChess/target/classes/view/CustomCamera.class
+ 0
− 0
View file @ 6a8daaf2
No preview for this file type
MavenChess/target/classes/model/Bishop.class deleted 100644 → 0
+ 0
− 0
View file @ d6bbacdf
File deleted
MavenChess/target/classes/model/Board.class deleted 100644 → 0
+ 0
− 0
View file @ d6bbacdf
File deleted
MavenChess/target/classes/model/King.class deleted 100644 → 0
+ 0
− 0
View file @ d6bbacdf
File deleted
MavenChess/target/classes/model/Knight.class deleted 100644 → 0
+ 0
− 0
View file @ d6bbacdf
File deleted
MavenChess/target/classes/model/Log.class deleted 100644 → 0
+ 0
− 0
View file @ d6bbacdf
File deleted
MavenChess/target/classes/model/Pawn.class deleted 100644 → 0
+ 0
− 0
View file @ d6bbacdf
File deleted
MavenChess/target/classes/model/Piece.class deleted 100644 → 0
+ 0
− 0
View file @ d6bbacdf
File deleted
MavenChess/target/classes/model/Position.class deleted 100644 → 0
+ 0
− 0
View file @ d6bbacdf
File deleted
MavenChess/target/classes/model/Queen.class deleted 100644 → 0
+ 0
− 0
View file @ d6bbacdf
File deleted
MavenChess/target/classes/model/Rook.class deleted 100644 → 0
+ 0
− 0
View file @ d6bbacdf
File deleted
MavenChess/target/classes/module-info.class deleted 100644 → 0
+ 0
− 0
View file @ d6bbacdf
File deleted
MavenChess/target/classes/view/CustomCamera.class deleted 100644 → 0
+ 0
− 0
View file @ d6bbacdf
File deleted
MavenChess/target/classes/view/CustomLight.class deleted 100644 → 0
+ 0
− 0
View file @ d6bbacdf
File deleted
MavenChess/target/classes/view/CustomMaterial.class deleted 100644 → 0
+ 0
− 0
View file @ d6bbacdf
File deleted
MavenChess/target/classes/view/CustomScene.class deleted 100644 → 0
+ 0
− 0
View file @ d6bbacdf
File deleted
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment