chore: fixing merge conflict

Signed-off-by: blam <ben@blam.sh>
2021-06-30 20:53:50 +02:00
parent a02ea1e4e1
commit 18660e9337
1 changed files with 0 additions and 4 deletions
@@ -1,9 +1,5 @@
 /*
-<<<<<<< HEAD:plugins/scaffolder-backend/src/scaffolder/stages/publish/helpers.ts
- * Copyright 2020 The Backstage Authors
-=======
 * Copyright 2021 The Backstage Authors
->>>>>>> breaking: removing alphav1 support for templates:plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.