From 57185ba684d3b4d606351132689d7f73ecdf3210 Mon Sep 17 00:00:00 2001
From: Cursed Entertainment <110344485+CursedPrograms@users.noreply.github.com>
Date: Wed, 14 Feb 2024 22:48:51 +0200
Subject: [PATCH] Revert "..."

---
 config.ini  | 40 ----------------------------------------
 config.json | 52 ----------------------------------------------------
 config.xml  | 52 ----------------------------------------------------
 3 files changed, 144 deletions(-)

diff --git a/config.ini b/config.ini
index 9cb9e31..69101bc 100644
--- a/config.ini
+++ b/config.ini
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 [Config]
 AppName = CursedGPT
 Description = CursedGPT leverages the Hugging Face Transformers library to interact with a pre-trained GPT-2 model. It employs TensorFlow for model management and AutoTokenizer for efficient tokenization. The script enables users to input prompts interactively, generating text responses from the GPT-2 model. To improve the user experience, unnecessary warning messages related to the transformers library are effectively suppressed.
@@ -17,41 +15,3 @@ TransformerScript = transformer.py
 TextToSpeechScript = transformer-t2s.py
 SpeechToTextToSpeechScript = transformer-s2t2s.py
 WebcamScript = transformer-webcam.py
-=======
-[Config]
-AppName = CursedGPT
-Description = CursedGPT leverages the Hugging Face Transformers library to interact with a pre-trained GPT-2 model. It employs TensorFlow for model management and AutoTokenizer for efficient tokenization. The script enables users to input prompts interactively, generating text responses from the GPT-2 model. To improve the user experience, unnecessary warning messages related to the transformers library are effectively suppressed.
-
-[ProjectStructure]
-MainScript = main.py
-TransformerScript = scripts/transformer.py
-Transformer-t2s-Script = scripts/transformer-t2s.py
-Transformer-s2t2s-Script = scripts/transformer-s2t2s.py
-Transforemer-WebcamScript = scripts/transformer-WebcamScript.py
-AppScript = app.py
-
-[Scripts]
-TransformerScript = transformer.py
-TextToSpeechScript = transformer-t2s.py
-SpeechToTextToSpeechScript = transformer-s2t2s.py
-WebcamScript = transformer-webcam.py
->>>>>>> parent of f3be308 (Merge pull request #2 from SynthWomb/_dev)
-=======
-[Config]
-AppName = CursedGPT
-Description = CursedGPT leverages the Hugging Face Transformers library to interact with a pre-trained GPT-2 model. It employs TensorFlow for model management and AutoTokenizer for efficient tokenization. The script enables users to input prompts interactively, generating text responses from the GPT-2 model. To improve the user experience, unnecessary warning messages related to the transformers library are effectively suppressed.
-
-[ProjectStructure]
-MainScript = main.py
-TransformerScript = scripts/transformer.py
-Transformer-t2s-Script = scripts/transformer-t2s.py
-Transformer-s2t2s-Script = scripts/transformer-s2t2s.py
-Transforemer-WebcamScript = scripts/transformer-WebcamScript.py
-AppScript = app.py
-
-[Scripts]
-TransformerScript = transformer.py
-TextToSpeechScript = transformer-t2s.py
-SpeechToTextToSpeechScript = transformer-s2t2s.py
-WebcamScript = transformer-webcam.py
->>>>>>> parent of f3be308 (Merge pull request #2 from SynthWomb/_dev)
diff --git a/config.json b/config.json
index c8786eb..c58796e 100644
--- a/config.json
+++ b/config.json
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 {
   "Config": {
     "AppName": "CursedGPT",
@@ -23,54 +21,4 @@
       "AppScript": "app.py"
     }
   }
-=======
-{
-  "Config": {
-    "AppName": "CursedGPT",
-    "Description": "CursedGPT leverages the Hugging Face Transformers library to interact with a pre-trained GPT-2 model. It employs TensorFlow for model management and AutoTokenizer for efficient tokenization. The script enables users to input prompts interactively, generating text responses from the GPT-2 model. To improve the user experience, unnecessary warning messages related to the transformers library are effectively suppressed.",
-    "ProjectStructure": {
-      "MainScript": "main.py",
-      "TransformerScript": "scripts/transformer.py",
-      "Transformer-t2s-Script": "scripts/transformer-t2s.py",
-      "Transformer-s2t2s-Script": "scripts/transformer-s2t2s.py",
-      "Transforemer-WebcamScript": "scripts/transformer-WebcamScript.py",
-      "DependenciesScript": "scripts/install-dependencies.py",
-      "AppScript": "app.py"
-    },
-    "Scripts": {
-      "MainScript": "main.py",
-      "TransformerScript": "scripts/transformer.py",
-      "Transformer-t2s-Script": "scripts/transformer-t2s.py",
-      "Transformer-s2t2s-Script": "scripts/transformer-s2t2s.py",
-      "Transforemer-WebcamScript": "scripts/transformer-WebcamScript.py",
-      "DependenciesScript": "scripts/install-dependencies.py",
-      "AppScript": "app.py"
-    }
-  }
->>>>>>> parent of f3be308 (Merge pull request #2 from SynthWomb/_dev)
-=======
-{
-  "Config": {
-    "AppName": "CursedGPT",
-    "Description": "CursedGPT leverages the Hugging Face Transformers library to interact with a pre-trained GPT-2 model. It employs TensorFlow for model management and AutoTokenizer for efficient tokenization. The script enables users to input prompts interactively, generating text responses from the GPT-2 model. To improve the user experience, unnecessary warning messages related to the transformers library are effectively suppressed.",
-    "ProjectStructure": {
-      "MainScript": "main.py",
-      "TransformerScript": "scripts/transformer.py",
-      "Transformer-t2s-Script": "scripts/transformer-t2s.py",
-      "Transformer-s2t2s-Script": "scripts/transformer-s2t2s.py",
-      "Transforemer-WebcamScript": "scripts/transformer-WebcamScript.py",
-      "DependenciesScript": "scripts/install-dependencies.py",
-      "AppScript": "app.py"
-    },
-    "Scripts": {
-      "MainScript": "main.py",
-      "TransformerScript": "scripts/transformer.py",
-      "Transformer-t2s-Script": "scripts/transformer-t2s.py",
-      "Transformer-s2t2s-Script": "scripts/transformer-s2t2s.py",
-      "Transforemer-WebcamScript": "scripts/transformer-WebcamScript.py",
-      "DependenciesScript": "scripts/install-dependencies.py",
-      "AppScript": "app.py"
-    }
-  }
->>>>>>> parent of f3be308 (Merge pull request #2 from SynthWomb/_dev)
 }
\ No newline at end of file
diff --git a/config.xml b/config.xml
index d9d8d1e..89df112 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 <Config>
     <AppName>CursedGPT</AppName>
     <Description>
@@ -23,53 +21,3 @@
         <WebcamScript>transformer-webcam.py</WebcamScript>
     </Scripts>
 </Config>
-=======
-<Config>
-    <AppName>CursedGPT</AppName>
-    <Description>
-        CursedGPT leverages the Hugging Face Transformers library to interact with a pre-trained GPT-2 model.
-        It employs TensorFlow for model management and AutoTokenizer for efficient tokenization.
-        The script enables users to input prompts interactively, generating text responses from the GPT-2 model.
-        To improve the user experience, unnecessary warning messages related to the transformers library are effectively suppressed.
-    </Description>
-    <ProjectStructure>
-        <MainScript>main.py</MainScript>
-        <TransformerScript>scripts/transformer.py</TransformerScript>
-        <Transformer-t2s-Script>scripts/transformer-t2s.py</Transformer-t2s-Script>
-        <Transformer-s2t2s-Script>scripts/transformer-s2t2s.py</Transformer-s2t2s-Script>
-        <Transforemer-WebcamScript>scripts/transformer-WebcamScript.py</Transforemer-WebcamScript>
-        <AppScript>app.py</AppScript>
-    </ProjectStructure>
-    <Scripts>
-        <TransformerScript>transformer.py</TransformerScript>
-        <TextToSpeechScript>transformer-t2s.py</TextToSpeechScript>
-        <SpeechToTextToSpeechScript>transformer-s2t2s.py</SpeechToTextToSpeechScript>
-        <WebcamScript>transformer-webcam.py</WebcamScript>
-    </Scripts>
-</Config>
->>>>>>> parent of f3be308 (Merge pull request #2 from SynthWomb/_dev)
-=======
-<Config>
-    <AppName>CursedGPT</AppName>
-    <Description>
-        CursedGPT leverages the Hugging Face Transformers library to interact with a pre-trained GPT-2 model.
-        It employs TensorFlow for model management and AutoTokenizer for efficient tokenization.
-        The script enables users to input prompts interactively, generating text responses from the GPT-2 model.
-        To improve the user experience, unnecessary warning messages related to the transformers library are effectively suppressed.
-    </Description>
-    <ProjectStructure>
-        <MainScript>main.py</MainScript>
-        <TransformerScript>scripts/transformer.py</TransformerScript>
-        <Transformer-t2s-Script>scripts/transformer-t2s.py</Transformer-t2s-Script>
-        <Transformer-s2t2s-Script>scripts/transformer-s2t2s.py</Transformer-s2t2s-Script>
-        <Transforemer-WebcamScript>scripts/transformer-WebcamScript.py</Transforemer-WebcamScript>
-        <AppScript>app.py</AppScript>
-    </ProjectStructure>
-    <Scripts>
-        <TransformerScript>transformer.py</TransformerScript>
-        <TextToSpeechScript>transformer-t2s.py</TextToSpeechScript>
-        <SpeechToTextToSpeechScript>transformer-s2t2s.py</SpeechToTextToSpeechScript>
-        <WebcamScript>transformer-webcam.py</WebcamScript>
-    </Scripts>
-</Config>
->>>>>>> parent of f3be308 (Merge pull request #2 from SynthWomb/_dev)