Commit 154b1311 authored by Petter Selfors Rølvåg's avatar Petter Selfors Rølvåg
Browse files

Merge branch 'dev' of...

Merge branch 'dev' of https://gitlab.stud.idi.ntnu.no/tdt4240-progark/tdt4240-progark-project into dev
parents 0fee8c4d efa265bc
......@@ -49,6 +49,10 @@ captures/
.idea/modules.xml
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
.idea/navEditor.xml
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser
CheckersServer/.idea/caches
CheckersClient/.idea/caches
# Keystore files
# Uncomment the following lines if you do not want to check your keystore files in.
......
Markdown is supported
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