diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 39981f8..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index b7f1e20..5b3d22e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ - -.idea/deployment.xml -.DS_Store +.idea/* +.pytest_cache/* +__pycache__/* \ No newline at end of file diff --git a/.idea/BangBangFluidControlSim2.iml b/.idea/BangBangFluidControlSim2.iml new file mode 100644 index 0000000..2838b3b --- /dev/null +++ b/.idea/BangBangFluidControlSim2.iml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dictionaries/brand.xml b/.idea/dictionaries/brand.xml new file mode 100644 index 0000000..cac09bb --- /dev/null +++ b/.idea/dictionaries/brand.xml @@ -0,0 +1,11 @@ + + + + dangerzone + kinter + pressurant + teensy + ullage + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 69f4cc9..d748479 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,10 @@ +<<<<<<< HEAD +======= + + + +>>>>>>> 0639761 (updated code) \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 77a7bc8..ff9df30 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -1,3 +1,4 @@ +<<<<<<< HEAD @@ -5,4 +6,13 @@ +======= + + + + + + + +>>>>>>> 0639761 (updated code) \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..d934def --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +