From 77406e68db4defae41bc027f537f453bf32dbf55 Mon Sep 17 00:00:00 2001
From: unknown <leo112071@gmail.com>
Date: Mon, 12 Feb 2018 15:56:43 +0700
Subject: [PATCH] Fix bug
---
.idea/modules.xml | 2 +-
app/src/main/res/values/strings.xml | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/.idea/modules.xml b/.idea/modules.xml
index abc31fc..b5de344 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/android.iml" filepath="$PROJECT_DIR$/android.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+ <module fileurl="file://$PROJECT_DIR$/fitness.iml" filepath="$PROJECT_DIR$/fitness.iml" />
</modules>
</component>
</project>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d154980..8c1b768 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,10 +1,7 @@
<resources>
<string name="app_name">FitnessDIY</string>
-<<<<<<< HEAD
<string name="logo_sub">Do It Yourself</string>
-=======
<string name="email">Email</string>
<string name="password">Password</string>
<string name="login">Login</string>
->>>>>>> 1eae9efeb4f06e5b2bc4295b06c363e1ea211597
</resources>
--
GitLab