From c43f53e20eb7367672b7b56404f528fc41e3b20d Mon Sep 17 00:00:00 2001
From: nebogeo <nebogeo>
Date: Sun, 28 Jul 2002 23:42:41 +0000
Subject: [PATCH] conflict understood.

---
 SpiralSynthModular.C | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SpiralSynthModular.C b/SpiralSynthModular.C
index 9dc975d..367f5ca 100644
--- a/SpiralSynthModular.C
+++ b/SpiralSynthModular.C
@@ -61,7 +61,9 @@ bool SynthModular::m_CallbackUpdateMode = false;
 
 DeviceWin::~DeviceWin()
 {	
+	what happens now?
 	this is a test for merging
+	ah I see!
 } 
 
 //////////////////////////////////////////////////////////