resolve conflicts

3 years ago · 9ba7f40d11
parent e56eae8265
commit 9ba7f40d11
1 changed files with 0 additions and 3 deletions
--- a/.env.template
+++ b/.env.template
@ -13,9 +13,6 @@ SUBREDDIT=""
 # Range is 0 -> 1
 OPACITY="0.9"
 <<<<<<< HEAD
 # Valid options are "male" and "female" for the variable below
 VoiceGender=""
 =======
 >>>>>>> 65afc5ccc1f1978d6ea7e4a5df8534badd3339b5