From f987e91c1bd18d354c9808811bddaac4531ac63b Mon Sep 17 00:00:00 2001
From: Estevan BIAU-LOYER <estevan.biau-loyer@ecam.fr>
Date: Wed, 29 Mar 2023 22:51:40 +0200
Subject: [PATCH] Update 'speech_analysis.m'

---
 speech_analysis.m | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/speech_analysis.m b/speech_analysis.m
index dfed670..b6eff76 100644
--- a/speech_analysis.m
+++ b/speech_analysis.m
@@ -3,7 +3,6 @@ pkg load signal
 audiowrite('outmodulator22.wav',y,fs/2);
 n = length(y); 
 t=0:1/fs:(n-1)/fs; % time range
-<<<<<<< HEAD
 figure;
 plot(t,y);
 xlabel('time (s)');
@@ -13,7 +12,7 @@ ylabel('amplitude');
 [power,duration]=frequencySpectrum(y, fs, false);
 figure;
 plot(duration,power);
-=======
+
 i=1;
 ldft=[];
 while (i<6)