From a3e501200755b601ecfd335cfd2fa09e54f047c8 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 4 Mar 2022 19:37:28 +0000
Subject: [PATCH 1/3] Update dependency @kellyselden/node-template to v2.2.2

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f40dd57..62358a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -65,9 +65,9 @@
       "dev": true
     },
     "@kellyselden/node-template": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@kellyselden/node-template/-/node-template-2.2.1.tgz",
-      "integrity": "sha512-8O/0TYAIvG164vWj1pO5AJK7RMW2HIbAyNuX3c6pWclIsTq3O24TRrkPabYC3D0kROI+nO66BwMVVcsSQidSjA==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@kellyselden/node-template/-/node-template-2.2.2.tgz",
+      "integrity": "sha512-e3DNremD2DuHp5ek0/AZFkOyIl5AdTUqX0xKaeVe0lBAXcLIligcNDQmEq7/7GslM+GbGSdDhD6LXxxw3AdtJg==",
       "dev": true
     },
     "@nodelib/fs.scandir": {
diff --git a/package.json b/package.json
index f6556bc..0622c31 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "sort-package-json": "^1.22.1"
   },
   "devDependencies": {
-    "@kellyselden/node-template": "2.2.1",
+    "@kellyselden/node-template": "2.2.2",
     "chai": "^4.3.6",
     "eslint": "^8.10.0",
     "eslint-config-sane": "^1.0.2",

From 7f87c685fdc7e0fc64ac06a1b1b3066f4f59b2a1 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 4 Mar 2022 19:40:25 +0000
Subject: [PATCH 2/3] ember-cli-update-action

ember-cli-update -p @kellyselden/node-template -b @kellyselden/node-template --to 2.2.2
---
 .github/workflows/ci.yml     | 2 ++
 .mocharc.js                  | 4 ++++
 config/ember-cli-update.json | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b046f54..2cdff79 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,8 @@
 name: CI
 
 on:
+  # allow manual running
+  workflow_dispatch:
   push:
     branches:
     - master
diff --git a/.mocharc.js b/.mocharc.js
index 31fc0ae..f5cb25f 100644
--- a/.mocharc.js
+++ b/.mocharc.js
@@ -1,6 +1,10 @@
 'use strict';
 
 module.exports = {
+<<<<<<< HEAD
   spec: ['tests'],
   recursive: true
+=======
+  spec: ['test/**/*-test.js']
+>>>>>>> a78ac5a (v2.2.1...v2.2.2)
 };
diff --git a/config/ember-cli-update.json b/config/ember-cli-update.json
index b0499e4..f15ae78 100644
--- a/config/ember-cli-update.json
+++ b/config/ember-cli-update.json
@@ -13,7 +13,7 @@
     },
     {
       "name": "@kellyselden/node-template",
-      "version": "2.2.1",
+      "version": "2.2.2",
       "blueprints": [
         {
           "name": "@kellyselden/node-template",

From c05e86ae4128e83b008b3682fb0307dc7716cd70 Mon Sep 17 00:00:00 2001
From: Kelly Selden <602423+kellyselden@users.noreply.github.com>
Date: Fri, 4 Mar 2022 19:54:09 +0000
Subject: [PATCH 3/3] chore: fix conflict

---
 .mocharc.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.mocharc.js b/.mocharc.js
index f5cb25f..31fc0ae 100644
--- a/.mocharc.js
+++ b/.mocharc.js
@@ -1,10 +1,6 @@
 'use strict';
 
 module.exports = {
-<<<<<<< HEAD
   spec: ['tests'],
   recursive: true
-=======
-  spec: ['test/**/*-test.js']
->>>>>>> a78ac5a (v2.2.1...v2.2.2)
 };