From f7293945b0e125570896ee3d7f758e14fb0e798e Mon Sep 17 00:00:00 2001
From: Bryan Jenks <bryanjenks@protonmail.com>
Date: Sun, 19 Jul 2020 19:01:25 -0700
Subject: [PATCH] fix merge issue

cli can be a pain sometimes
---
 flash | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/flash b/flash
index 2c56cb3..9c89e40 100755
--- a/flash
+++ b/flash
@@ -250,14 +250,9 @@ $(if [ ${#QUESTION} -lt 59 ]; then printf "%$(( ( 59 - ${#QUESTION} ) / 2 ))s";
 add_usage_entry(){
     if [ ! "$COUNTER" = 0 ]; then
         # Create a New Entry
-<<<<<<< HEAD
         TIME_STAMP=$(date +"%Y%m%d %H:%M:%S")
         REVIEWED_DECK="$(echo "$EXAMPLE_DECK" | awk -F/ '{print $7}')"
-        printf -v ENTRY "TimeStamp: %s Deck: %s cardsReviewed: %s" "$TIME_STAMP" "$REVIEWED_DECK" "$COUNTER"
-=======
-        TIME_STAMP=$(date --rfc-3339=seconds)
         printf -v ENTRY "TimeStamp: %s Deck: %s cardsReviewed: %s" "$TIME_STAMP" "$CURRENT_DECK" "$COUNTER"
->>>>>>> 96762bab041d0351c1bc8e94e38757aa2f618013
         echo "$ENTRY" >> "$REVIEW_LOG"
     fi
 }