Conflict resolution

Conflict resolution on merge
QutEcoacoustics · Jan 23, 2020 · c5ab40d · c5ab40d
1 parent 77abfde
commit c5ab40d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 631 deletions.
diff --git a/src/AnalysisConfigFiles/IndexPropertiesConfig.HiRes.yml b/src/AnalysisConfigFiles/IndexPropertiesConfig.HiRes.yml
@@ -370,7 +370,7 @@ FileName:
 # ADD NEW SPECTRAL INDICES BELOW HERE
 
 # IMPORTANT:  SPECTRAL INDCIES MUST BE OF TYPE Double[]
-# When CalculateNormMin: and CalculateNormMax: are set true, the normalisation bounds
+# When CalculateNormBounds: are set true, the normalisation bounds
 #  for colour display will be calculated according to the distribution values in the 
 #   /Towsey.Acoustic/xxxxxxxxx_SpectralIndexStatistics.json File. 
 #   The norm min set = MODE - (0.1*SD) of the distribution

diff --git a/src/AnalysisConfigFiles/IndexPropertiesConfig.yml b/src/AnalysisConfigFiles/IndexPropertiesConfig.yml
@@ -581,8 +581,6 @@ OSC:
   # Merge conflict values from https://github.com/QutEcoacoustics/audio-analysis/pull/233
   #NormMin: 0.0
   #NormMax: 10.0
-  #CalculateNormMin: true
-  #CalculateNormMax: true
   ProjectID: Acoustic Indices
   Units: ""
 SUM:
@@ -616,10 +614,6 @@ RHZ:
   NormMin: 0.1
   NormMax: 1.0
   CalculateNormBounds: false
-  # Merge conflict values from https://github.com/QutEcoacoustics/audio-analysis/pull/233
-  #NormMax: 1.5
-  #CalculateNormMin: false
-  #alculateNormMax: false
   ProjectID: Acoustic Indices
   Units: "tracks/s"
 RVT:
@@ -631,9 +625,6 @@ RVT:
   NormMin: 0.1
   NormMax: 0.4
   CalculateNormBounds: true
-  # Merge conflict values from https://github.com/QutEcoacoustics/audio-analysis/pull/233
-  #CalculateNormMin: false
-  #CalculateNormMax: false
   ProjectID: Acoustic Indices
   Units: "tracks/s"
 RPS:
@@ -645,9 +636,6 @@ RPS:
   NormMin: 0.0
   NormMax: 0.4
   CalculateNormBounds: true
-  # Merge conflict values from https://github.com/QutEcoacoustics/audio-analysis/pull/233
-  #CalculateNormMin: false
-  #CalculateNormMax: false
   ProjectID: Acoustic Indices
   Units: "tracks/s"
 RNG:
@@ -659,9 +647,6 @@ RNG:
   NormMin: 0.0
   NormMax: 0.4
   CalculateNormBounds: true
-  # Merge conflict values from https://github.com/QutEcoacoustics/audio-analysis/pull/233
-  #CalculateNormMin: false
-  #CalculateNormMax: false
   ProjectID: Acoustic Indices
   Units: "tracks/s"
 SPT: