fixed itaHRTF

7fab1600 · Michael Kohnen · b90ca90d · 7fab1600
Commit 7fab1600 authored Dec 07, 2017 by Michael Kohnen
--- a/applications/Binaural-HRTF/HRTF_class/@itaHRTF/itaHRTF.m
+++ b/applications/Binaural-HRTF/HRTF_class/@itaHRTF/itaHRTF.m
@@ -432,7 +432,6 @@ classdef  itaHRTF < itaAudio
                end
            end
            
-<<<<<<< HEAD
            % Proceed (version independent)
            names=fieldnames(tempMetadata);
            for k=1:(numel(names))