committed

ernest-phillips · ernest-phillips · commit 9853684be923 · 2019-01-09T11:37:21.000-08:00
diff --git a/app/workout/workout.model.js b/app/workout/workout.model.js
@@ -1,10 +1,5 @@
 const mongoose = require("mongoose");
 const Joi = require("joi");
-<<<<<<< HEAD
-
-
-=======
->>>>>>> dff35dff0e6fd194376bd54c2775744a4a60aa8b
 
 const workoutSchema = new mongoose.Schema({
     user: {
