diff --git a/.idea/eightQueens.iml b/.idea/eightQueens.iml index dbfb99b..20b7699 100644 --- a/.idea/eightQueens.iml +++ b/.idea/eightQueens.iml @@ -3,9 +3,12 @@ +<<<<<<< HEAD +======= +>>>>>>> release/workingfinal @@ -14,6 +17,9 @@ +<<<<<<< HEAD +======= +>>>>>>> release/workingfinal \ No newline at end of file diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml index dde9ac4..a648126 100644 --- a/.idea/libraries/Dart_Packages.xml +++ b/.idea/libraries/Dart_Packages.xml @@ -226,6 +226,16 @@ +<<<<<<< HEAD +======= + + + + + + +>>>>>>> release/workingfinal @@ -271,6 +281,10 @@ +<<<<<<< HEAD +======= + +>>>>>>> release/workingfinal diff --git a/.idea/workspace.xml b/.idea/workspace.xml index dfeec13..8abb03e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,6 +2,7 @@ +<<<<<<< HEAD <<<<<<< HEAD @@ -69,6 +70,8 @@ ======= +======= +>>>>>>> release/workingfinal >>>>>>> release/working-2 @@ -79,8 +82,7 @@ - @@ -95,7 +97,7 @@ - + @@ -104,30 +106,42 @@ - - + + + - + - - + + + + + - - + + +<<<<<<< HEAD >>>>>>> release/working-2 +======= + + + + + +>>>>>>> release/workingfinal @@ -141,10 +155,22 @@ ======= - - + + - + + + + + + + + + + + + + >>>>>>> release/working-2 @@ -155,7 +181,11 @@ ======= - + + + + + >>>>>>> release/working-2 @@ -172,8 +202,11 @@ @@ -183,15 +216,21 @@ @@ -206,8 +245,11 @@ <<<<<<< HEAD +<<<<<<< HEAD ======= +======= +>>>>>>> release/workingfinal >>>>>>> release/working-2 @@ -247,11 +289,15 @@