From 18660e933765f2b93c328bc15f04af7c637cd050 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 30 Jun 2021 20:53:50 +0200
Subject: [PATCH] chore: fixing merge conflict

Signed-off-by: blam <ben@blam.sh>
---
 .../src/scaffolder/actions/builtin/helpers.ts                 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts
index a024be4f67..e2459a8ca7 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts
@@ -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.