From 8797a3a5f3cd55715c00296848e7590a899595f4 Mon Sep 17 00:00:00 2001
From: Timm Stokke <timm@stokke.me>
Date: Mon, 6 Jan 2025 15:33:31 +0100
Subject: [PATCH] chore: fix merge conflict

---
 src/utils/registerTemplate.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/registerTemplate.ts b/src/utils/registerTemplate.ts
index ffa6866..06009f6 100644
--- a/src/utils/registerTemplate.ts
+++ b/src/utils/registerTemplate.ts
@@ -2,7 +2,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import chalk from 'chalk';
 import { calculateMD5 } from './calculateMD5.js';
-import { getConfig } from './config.js';
+import { getConfig } from './config.js'; // keep this
 import { fileExists } from './fileExists.js';
 import { loadBuildLog } from './loadBuildLog.js';
 import { saveBuildLog } from './saveBuildLog.js';