From c6e14ac11ef0ff007d2f9e6e002edd684ef1470f Mon Sep 17 00:00:00 2001
From: Bryan Jenks <bryanjenks@protonmail.com>
Date: Thu, 17 Sep 2020 11:14:22 -0700
Subject: [PATCH 1/5] fix weird commit

---
 flash | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/flash b/flash
index 89dff49..fcfc4cc 100755
--- a/flash
+++ b/flash
@@ -330,16 +330,11 @@ ${LGREY}Select a number to continue, or${NC} ${LRED}Q${NC} ${LGREY}to quit...${N
 
     # Update item score for each flashcard item
     ## Remove forward slashes in the Questions and answers
-<<<<<<< Updated upstream
-    QUESTION_REGEX=$(sed "s/\(\/\|\[\|\]\|\*\)/\\\\\1/g" <<<"${q[1]}")
-    ANSWER_REGEX=$(sed "s/\(\/\|\[\|\]\|\*\)/\\\\\1/g" <<<"${q[2]}")
-=======
+
     QUESTION_REGEX="$(sed "s/\(\/\|\[\|\]\|\*\)/\\\\\1/g" <<<"${q[1]}")"
     ANSWER_REGEX="$(sed "s/\(\/\|\[\|\]\|\*\)/\\\\\1/g" <<<"${q[2]}")"
-    # sed -i "s/${q[0]}:$QUESTION_REGEX:$ANSWER_REGEX:${q[3]}/${q[0]}:$QUESTION_REGEX:$ANSWER_REGEX:$NEW_ITEM_SCORE/g" "$DECK"
->>>>>>> Stashed changes
-    sed -i .bak "s/${q[0]}:$QUESTION_REGEX:$ANSWER_REGEX:${q[3]}/${q[0]}:$QUESTION_REGEX:$ANSWER_REGEX:$NEW_ITEM_SCORE/g" "$DECK"
-    rm ./*.bak
+    sed -i .bak "s/${q[0]}:$QUESTION_REGEX:$ANSWER_REGEX:${q[3]}/${q[0]}:$QUESTION_REGEX:$ANSWER_REGEX:$NEW_ITEM_SCORE/g" "$DECK" && rm ./*.bak
+    
     # If no highscore currently set, set it.
     [ -z "$(cat "$HIGH_SCORE")" ] && echo "$COUNTER" >"$HIGH_SCORE"
 

From eeb7ed900ac640ba2d850a96c25ec1090f67db68 Mon Sep 17 00:00:00 2001
From: Bryan Jenks <bryanjenks@protonmail.com>
Date: Tue, 29 Sep 2020 14:55:47 -0700
Subject: [PATCH 2/5] smart phone verbiage

---
 .github/ISSUE_TEMPLATE/bug_report.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 0da0e05..342e2b9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -28,6 +28,13 @@ If applicable, add screenshots to help explain your problem.
  - Terminal Emulator [e.g. st, kitty, etc]
  - Shell [e.g. bash, zsh, fish]
 
+## Smartphone (please complete the following information):
+
+- Device: [e.g. iPhone6]
+- OS: [e.g. iOS8.1]
+- Browser [e.g. stock browser, safari]
+- Version [e.g. 22]
+
 **Additional context**
 Add any other context about the problem here.
 

From 5ebdfbe2633de8d3f67997be5fbde116062e2a1b Mon Sep 17 00:00:00 2001
From: Bryan Jenks <bryanjenks@protonmail.com>
Date: Tue, 29 Sep 2020 21:31:08 -0700
Subject: [PATCH 3/5] test stale workflow

---
 .github/workflows/stale.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/workflows/stale.yml

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
new file mode 100644
index 0000000..3404517
--- /dev/null
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,19 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'Stale issue message'
+        stale-pr-message: 'Stale pull request message'
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'

From 3ea4c265680803bd3e2b18e88178079be116f12e Mon Sep 17 00:00:00 2001
From: Bryan Jenks <bryanjenks@protonmail.com>
Date: Tue, 29 Sep 2020 21:34:44 -0700
Subject: [PATCH 4/5] test workflows

---
 .github/workflows/greetings.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/workflows/greetings.yml

diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
new file mode 100644
index 0000000..fca437f
--- /dev/null
+++ b/.github/workflows/greetings.yml
@@ -0,0 +1,13 @@
+name: Greetings
+
+on: [pull_request, issues]
+
+jobs:
+  greeting:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/first-interaction@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        issue-message: 'This was your first issue! Thank you for contributing!'' first issue'
+        pr-message: 'This was your first Pull Request! Thank you for contributing!'' first pr'

From bf17b7d3c0e2fce005bb68f262af715f5f229040 Mon Sep 17 00:00:00 2001
From: Bryan Jenks <bryanjenks@protonmail.com>
Date: Fri, 16 Oct 2020 09:43:03 -0700
Subject: [PATCH 5/5] Version update in the command

---
 flash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flash b/flash
index fcfc4cc..6fdfcb0 100755
--- a/flash
+++ b/flash
@@ -198,7 +198,7 @@ while getopts 'hivp:' flag; do
     case "${flag}" in
     h) print_usage && exit 0 ;;
     i) print_info && exit 0 ;;
-    v) echo -e "\n${YELLOW}fla.sh Current Version:${NC} ${RED}1.1${NC}\n" && exit 0 ;;
+    v) echo -e "\n${YELLOW}fla.sh Current Version:${NC} ${RED}1.2${NC}\n" && exit 0 ;;
     p) { [[ $(command -v "$OPTARG" 2>&1) ]] && PREVIEWER=$OPTARG; } || echo "Unable to find previewer $OPTARG. Exiting..." && exit 1 ;;
     *) print_usage && exit 1 ;;
     esac