# HG changeset patch
# User Matthias Mauch <mail@matthiasmauch.net>
# Date 1288098233 -32400
# Node ID 3f58f4567f94b6a5899207146ea3b87dbd261424
# Parent  1d2f3a3f67613fd3d7b75dfea84104ca25391c42
changed readme file

diff -r 1d2f3a3f6761 -r 3f58f4567f94 README
--- a/README	Tue Oct 26 21:41:54 2010 +0900
+++ b/README	Tue Oct 26 22:03:53 2010 +0900
@@ -1,11 +1,7 @@
 ### NNLS Chroma ###
 
 System identifier – vamp:nnls-chroma:nnls-chroma
-<<<<<<< local
-RDF URI – http://vamp-plugins.org/rdf/plugins/nnls-chroma#nnls-chroma 
-=======
 RDF URI – http://vamp-plugins.org/rdf/plugins/nnls-chroma#nnls-chroma
->>>>>>> other
 
 #### General Description ####
 
@@ -38,11 +34,7 @@
 ### Chordino ###
 
 System identifier – vamp:nnls-chroma:chordino
-<<<<<<< local
-RDF URI – http://vamp-plugins.org/rdf/plugins/nnls-chroma#chordino 
-=======
 RDF URI – http://vamp-plugins.org/rdf/plugins/nnls-chroma#chordino
->>>>>>> other
 
 #### General Description ####
 
@@ -50,8 +42,6 @@
 
 #### Parameters ####
 
-The default settings (in brackets, below) are those used for Matthias Mauch's 2010 MIREX submissions.
-
 * use approximate transcription (NNLS) (on or off; default: on): toggle between NNLS approximate transcription and linear spectral mapping.
 * HMM (Viterbi decoding) (on or off; default: on): uses HMM/Viterbi smoothing. Otherwise: heuristic chord change smoothing.
 * spectral roll on (0 % -- 5 %; default: 0 %): consider the cumulative energy spectrum (from low to high frequencies). All bins below the first bin whose cumulative energy exceeds the quantile [spectral roll on] x [total energy] will be set to 0. A value of 0 means that no bins will be changed.
@@ -68,11 +58,7 @@
 ### Tuning ###
 
 System identifier – vamp:nnls-chroma:tuning
-<<<<<<< local
-RDF URI – http://vamp-plugins.org/rdf/plugins/nnls-chroma#tuning 
-=======
 RDF URI – http://vamp-plugins.org/rdf/plugins/nnls-chroma#tuning
->>>>>>> other
 
 #### General Description ####