From 28f66ea0b7a1e0db07fc5cb60f2ff6fa61b9da9d Mon Sep 17 00:00:00 2001
From: Greg Jacobs <greg.jacobs@communify.com>
Date: Mon, 26 Jan 2026 16:18:53 -0500
Subject: [PATCH] fix: Remove unnecessary blank lines in
 mergeConflictManager.js

---
 src/utils/oddsNends/mergeConflictManager.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/oddsNends/mergeConflictManager.js b/src/utils/oddsNends/mergeConflictManager.js
index a9306b1..4df8a3d 100644
--- a/src/utils/oddsNends/mergeConflictManager.js
+++ b/src/utils/oddsNends/mergeConflictManager.js
@@ -41,7 +41,7 @@ for (let i = 0; i < commands.length; i++) {
 	} catch (error) {
 		console.error(`\n✗ Failed at command: ${cmd}`);
 		console.error(`Exit code: ${error.status}`);
-		
+
 		// If the merge command fails, open VS Code with the repository
 		if (cmd.startsWith('git merge')) {
 			console.log(`\nOpening VS Code to resolve merge conflicts...`);
@@ -51,7 +51,7 @@ for (let i = 0; i < commands.length; i++) {
 				console.error('Failed to open VS Code');
 			}
 		}
-		
+
 		process.exit(1);
 	}
 }