From 07e371f26e8acf023f22618a15f88efdaa200608 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 16 Feb 2022 09:18:01 +0100
Subject: [PATCH] resolve overlooked merge conflict
---
GUI/Model/Device/InstrumentLibrary.cpp | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/GUI/Model/Device/InstrumentLibrary.cpp b/GUI/Model/Device/InstrumentLibrary.cpp
index 4d02b56e9b9..a9b957c3a38 100644
--- a/GUI/Model/Device/InstrumentLibrary.cpp
+++ b/GUI/Model/Device/InstrumentLibrary.cpp
@@ -110,13 +110,8 @@ bool InstrumentLibrary::load()
if (foundVersion != 2)
return false;
-<<<<<<< HEAD
- Serializer sInstruments(&reader);
- m_instrumentItems.serialize(sInstruments);
-=======
Streamer sInstruments(&reader);
- m_model.serialize(sInstruments);
->>>>>>> af4532a401 (rename Serializer -> Streamer)
+ m_instrumentItems.serialize(sInstruments);
}
}
}
--
GitLab