clear vesrsions conflits

pd3v · Jul 2, 2020 · b09b814 · b09b814
2 parents a52c013 + a9709d8
commit b09b814
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,4 +13,22 @@
 
 . **x**, stands for rest note
 
-__
+__
+
+
+## 0.3.1
+
+
+. Validations in some helper functions
+
+. Improved sync
+
+. Short-typed note duration pattern; eg. short-typed {4,3,6,8} parses into {4,3,3,3,6,6,6,6,6,6,8,8}. 1st 1/4 = 4, 2nd 1/4 = 3,3,3, etc.
+
+. New helper functions - **edger**, **edgerx**, **swarm**, **chop**, **insync** and **bounce**
+
+. Instruments +1 to work as a metronome (metro()), alias **sync**
+
+. Rename **istep** to **isync**, **ccstep** to **ccsync**, **whenMod** to **when**
+
+__
diff --git a/wide/wide.cpp b/wide/wide.cpp
@@ -170,7 +170,6 @@ class Generator {
     if (notes.dur.size() == 1) {
       notes.dur.resize(BAR_DUR_REF/duration[(notes.dur.front())]);
       fill(notes.dur.begin(),notes.dur.end(),notes.dur.front());
-
       return notes.dur;
     }