diff --git a/.DS_Store b/.DS_Store index f260456..4d55317 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/MemeProject/.idea/compiler.xml b/MemeProject/.idea/compiler.xml index 217af47..9a8b7e5 100644 --- a/MemeProject/.idea/compiler.xml +++ b/MemeProject/.idea/compiler.xml @@ -19,5 +19,4 @@ - - + \ No newline at end of file diff --git a/MemeProject/.idea/encodings.xml b/MemeProject/.idea/encodings.xml deleted file mode 100644 index e206d70..0000000 --- a/MemeProject/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/MemeProject/.idea/gradle.xml b/MemeProject/.idea/gradle.xml index 736c7b5..1bbc21d 100644 --- a/MemeProject/.idea/gradle.xml +++ b/MemeProject/.idea/gradle.xml @@ -5,6 +5,7 @@ - - + \ No newline at end of file diff --git a/MemeProject/.idea/misc.xml b/MemeProject/.idea/misc.xml index d415385..4684197 100644 --- a/MemeProject/.idea/misc.xml +++ b/MemeProject/.idea/misc.xml @@ -3,6 +3,13 @@ + + + @@ -13,7 +20,7 @@ - + @@ -35,5 +42,4 @@ - - + \ No newline at end of file diff --git a/MemeProject/.idea/modules.xml b/MemeProject/.idea/modules.xml index db189d3..d953495 100644 --- a/MemeProject/.idea/modules.xml +++ b/MemeProject/.idea/modules.xml @@ -6,5 +6,4 @@ - - + \ No newline at end of file diff --git a/MemeProject/.idea/scopes/scope_settings.xml b/MemeProject/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b..0000000 --- a/MemeProject/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/MemeProject/.idea/vcs.xml b/MemeProject/.idea/vcs.xml index def6a6a..6564d52 100644 --- a/MemeProject/.idea/vcs.xml +++ b/MemeProject/.idea/vcs.xml @@ -3,5 +3,4 @@ - - + \ No newline at end of file diff --git a/MemeProject/MemeProject.iml b/MemeProject/MemeProject.iml index 29deca7..9a5441c 100644 --- a/MemeProject/MemeProject.iml +++ b/MemeProject/MemeProject.iml @@ -4,6 +4,7 @@ @@ -15,5 +16,4 @@ - - + \ No newline at end of file diff --git a/MemeProject/app/app.iml b/MemeProject/app/app.iml index eb0313a..a3753c9 100644 --- a/MemeProject/app/app.iml +++ b/MemeProject/app/app.iml @@ -12,8 +12,9 @@