From 311067136ba6926b28a329637a088ebe2af1264b Mon Sep 17 00:00:00 2001
From: jannis <jannis@tadris.de>
Date: Tue, 20 Aug 2019 17:53:53 +0200
Subject: [PATCH] Merge fixes

---
 app/src/main/java/de/tadris/fitness/view/WorkoutAdapter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/de/tadris/fitness/view/WorkoutAdapter.java b/app/src/main/java/de/tadris/fitness/view/WorkoutAdapter.java
index 624b4e6..1365ef3 100644
--- a/app/src/main/java/de/tadris/fitness/view/WorkoutAdapter.java
+++ b/app/src/main/java/de/tadris/fitness/view/WorkoutAdapter.java
@@ -17,7 +17,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.tadris.fitness;
+package de.tadris.fitness.view;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -30,6 +30,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import de.tadris.fitness.R;
 import de.tadris.fitness.data.Workout;
 import de.tadris.fitness.util.UnitUtils;
 import de.tadris.fitness.util.WorkoutTypeCalculator;