Conflict fixing

Fixed??

.gitignore

@@ -231,6 +231,7 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
 
+assets/
 out
 .DS_Store
 .setup-done-before

TTS/GTTS.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 import random
-
+from utils import settings
 from gtts import gTTS
 
-from utils import settings
+max_chars = 0
 
 class GTTS:
     def __init__(self):

install.sh

@@ -62,14 +62,7 @@ function install_macos(){
     fi
     # Install the required packages
     echo "Installing required Packages" 
-
-    if [! command --version python3 &> /dev/null ]; then
-	    echo "Installing python3"
-	    brew install python@3.10
-    else
-	    echo "python3 already installed."
-    fi
-    brew install tcl-tk python-tk
+    brew install python@3.10 tcl-tk python-tk
 } 
 
 # Function to install for arch (and other forks like manjaro)

video_creation/data/videos.json

@@ -1,10 +1 @@
-[
-    {
-        "subreddit": "AskReddit",
-        "id": "w2orm0",
-        "time": "1658271429",
-        "background_credit": "No Copyright Gameplay",
-        "reddit_title": "What comedian has never ever made you laugh",
-        "filename": "What comedian has never ever made you laugh.mp4"
-    }
-]
+[]