From 9ec7c3c50b8fac16cc52b21058b87941f2a9b5ef Mon Sep 17 00:00:00 2001
From: yemaozi88 <428968@gmail.com>
Date: Sun, 30 Dec 2018 21:36:12 +0100
Subject: [PATCH] commit to clean up.

---
 acoustic_model/defaultfiles.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/acoustic_model/defaultfiles.py b/acoustic_model/defaultfiles.py
index f66ae65..ae510fc 100644
--- a/acoustic_model/defaultfiles.py
+++ b/acoustic_model/defaultfiles.py
@@ -27,10 +27,9 @@ config_hvite = os.path.join(cygwin_dir, 'config', 'config.HVite')
 #AcousticModel = config['pyHTK']['AcousticModel']
 
 repo_dir = r'C:\Users\Aki\source\repos'
-ipa_xsampa_converter_dir = os.path.join(repo_dir, 'ipa-xsama-converter')
+ipa_xsampa_converter_dir    = os.path.join(repo_dir, 'ipa-xsama-converter')
 forced_alignment_module_dir = os.path.join(repo_dir, 'forced_alignment')
 
-<<<<<<< HEAD
 WSL_dir   = r'C:\OneDrive\WSL'
 fame_dir        = os.path.join(WSL_dir, 'kaldi-trunk', 'egs', 'fame')
 fame_s5_dir     = os.path.join(fame_dir, 's5')
@@ -43,9 +42,4 @@ phonelist_friesian_txt     = os.path.join(experiments_dir, 'friesian', 'acoustic
 
 novo_api_dir = os.path.join(WSL_dir, 'python-novo-api')
 cmu69_phoneset = os.path.join(novo_api_dir, 'novoapi', 'asr', 'phoneset', 'en', 'cmu69.phoneset')
-=======
-fame_dir = r'C:\OneDrive\WSL\kaldi-trunk\egs\fame\s5\corpus'
-experiments_dir = r'c:\OneDrive\Research\rug\experiments'
->>>>>>> parent of b87a81e... the script 'forced_alignment_novo.py' which is to run novo_api on Python 3.6 environment is added.
 
-phonelist = os.path.join(experiments_dir, 'friesian', 'acoustic_model', 'config', 'phonelist_friesian.txt')
\ No newline at end of file