From affe282b792bb0cf95566d9098dc168239251580 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 11 Jul 2024 19:18:38 -0600
Subject: [PATCH] fix error in manual merge correction

---
 libs/ardour/session_state.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 4c3af65e74..6534a3bd7a 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -1795,7 +1795,6 @@ Session::set_state (const XMLNode& node, int version)
 		if (modified_with.rfind (PROGRAM_NAME, 0) != 0) {
 			throw WrongProgram (modified_with);
 		}
-#endif
 	}
 
 #ifdef LIVETRAX