diff --git a/.idea/Python.iml b/.idea/Python.iml index b4e13b8..5a21be2 100644 --- a/.idea/Python.iml +++ b/.idea/Python.iml @@ -2,7 +2,7 @@ - + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index b5e3fb8..15a15b2 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,6 +1,4 @@ - - - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 7064634..fe78e36 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..3ea0af8 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9e01e86..1405d16 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,11 +2,21 @@ +<<<<<<< HEAD - + + + +======= +>>>>>>> bian + + + - - +<<<<<<< HEAD + +======= +>>>>>>> bian + + + + + + + + + + - - + + - +<<<<<<< HEAD + + +======= + +>>>>>>> bian - + +<<<<<<< HEAD + + + + + + + +======= - - + + @@ -42,6 +76,28 @@ +>>>>>>> bian + + + + + + + + + + + + + + + + + + + + + @@ -69,6 +125,23 @@ + + + + - -