Skip to content
Snippets Groups Projects
Commit 4fbe1fbe authored by Jan Peter Schweers's avatar Jan Peter Schweers
Browse files

Merge branch 'main' into 'develop' 

# Conflicts:
#   .idea/vcs.xml
parents e2efc498 645370e0
No related branches found
No related tags found
1 merge request!6Add final version of the game to main branch
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 1 deletion
.idea/vcs.xml
+ 0
− 1
View file @ 4fbe1fbe
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" /> <mapping directory="$PROJECT_DIR$" vcs="Git" />
</component> </component>
</project> </project>
\ No newline at end of file
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