these constants have been moved to spectrum analyser

LMMS · Mar 3, 2025 · 3fb24f2 · 3fb24f2
1 parent adc38e3
commit 3fb24f2
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/include/lmms_constants.h b/include/lmms_constants.h
@@ -36,13 +36,16 @@ inline constexpr ch_cnt_t DEFAULT_CHANNELS = 2;
 inline constexpr unsigned MaxScaleCount = 10;  //!< number of scales per project
 inline constexpr unsigned MaxKeymapCount = 10; //!< number of keyboard mappings per project
 
+<<<<<<< HEAD
 inline constexpr char LADSPA_PATH_SEPERATOR =
 #ifdef LMMS_BUILD_WIN32
 ';';
 #else
 ':';
 #endif
 
+=======
+>>>>>>> 39f1ceae6 (these constants have been moved to spectrum analyser)
 constexpr char LADSPA_PATH_SEPERATOR =
 #ifdef LMMS_BUILD_WIN32
 ';';