diff --git a/project/.idea/workspace.xml b/project/.idea/workspace.xml index 104aa94..48c8c74 100644 --- a/project/.idea/workspace.xml +++ b/project/.idea/workspace.xml @@ -1,12 +1,128 @@ + + + +<<<<<<< Updated upstream + + + +======= + + + + + + + + + + + +>>>>>>> Stashed changes + + + + + + + +<<<<<<< Updated upstream + +======= + + + + + + + + + + + + + +