diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..0c2ceae --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +team5-java-cli-board \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index a332a14..b7b1a67 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,10 +1,25 @@ +<<<<<<< HEAD