ember-cli-update-action

ember-cli-update -p @kellyselden/node-template -b @kellyselden/node-template --to 5.0.0
kellyselden · Oct 30, 2023 · 690fcd1 · 690fcd1
1 parent b5d1182
commit 690fcd1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-    - master
+    - main
   pull_request:
 
 jobs:

diff --git a/README.md b/README.md
@@ -1,6 +1,12 @@
 # git-diff-apply
 
+<<<<<<< HEAD
 [![npm version](https://badge.fury.io/js/git-diff-apply.svg)](https://badge.fury.io/js/git-diff-apply)
 [![Build status](https://ci.appveyor.com/api/projects/status/imgjd20sv5itmnlo/branch/master?svg=true)](https://ci.appveyor.com/project/kellyselden/git-diff-apply/branch/master)
 
 Use an unrelated remote repository to apply a git diff
+=======
+
+
+[![Build status](https://ci.appveyor.com/api/projects/status/imgjd20sv5itmnlo/branch/main?svg=true)](https://ci.appveyor.com/project/kellyselden/git-diff-apply/branch/main)
+>>>>>>> 646996c (v4.1.0...v5.0.0)
diff --git a/appveyor.yml b/appveyor.yml
@@ -6,7 +6,7 @@ environment:
 
 branches:
   only:
-    - master
+    - main
 
 # Fix line endings in Windows. (runs before repo cloning)
 init:

diff --git a/config/ember-cli-update.json b/config/ember-cli-update.json
@@ -13,7 +13,7 @@
     },
     {
       "name": "@kellyselden/node-template",
-      "version": "4.1.0",
+      "version": "5.0.0",
       "blueprints": [
         {
           "name": "@kellyselden/node-template",