Browse Source

conflict understood.

master
nebogeo 23 years ago
parent
commit
c43f53e20e
1 changed files with 2 additions and 0 deletions
  1. +2
    -0
      SpiralSynthModular.C

+ 2
- 0
SpiralSynthModular.C View File

@@ -61,7 +61,9 @@ bool SynthModular::m_CallbackUpdateMode = false;

DeviceWin::~DeviceWin()
{
what happens now?
this is a test for merging
ah I see!
}

//////////////////////////////////////////////////////////


Loading…
Cancel
Save