commit

4 years ago · 0f03026d4f
parent 3a1c972a2a
commit 0f03026d4f
2 changed files with 14 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -244,3 +244,4 @@ video_creation/data/envvars.txt

 config.toml
 video_creation/data/videos.json
+video_creation/data/videos.json
--- a/video_creation/data/videos.json
+++ b/video_creation/data/videos.json
@ -1 +1,14 @@
+<<<<<<< Updated upstream
 []
+=======
+[
+    {
+        "subreddit": "AskReddit",
+        "id": "wx7oes",
+        "time": "1661435423",
+        "background_credit": "bbswitzer",
+        "reddit_title": "people of Reddit what do you just not give a fuck about",
+        "filename": "people of Reddit what do you just not give a fuck about.mp4"
+    }
+]
+>>>>>>> Stashed changes