diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml index f58978a..cc85761 100644 --- a/.idea/libraries/Flutter_Plugins.xml +++ b/.idea/libraries/Flutter_Plugins.xml @@ -1,9 +1,13 @@ +<<<<<<< HEAD +======= + +>>>>>>> release/working-2 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 64b1431..dfeec13 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,6 +3,7 @@ +<<<<<<< HEAD @@ -66,6 +67,10 @@ +======= + + +>>>>>>> release/working-2