From 0e89a4bda84800ea2983dbf31f3443ec2513f057 Mon Sep 17 00:00:00 2001 From: Saransh Chopra Date: Wed, 2 Nov 2022 13:10:34 +0530 Subject: [PATCH 1/2] Fix twitter api error --- .gitignore | 4 ++++ bot/twitter_api/tweet_plot.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 592a6330..ca37160d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,9 @@ tempCodeRunnerFile.py plot.gif .coverage .ipynb_checkpoints +<<<<<<< Updated upstream plot*.png .DS_Store +======= +.env +>>>>>>> Stashed changes diff --git a/bot/twitter_api/tweet_plot.py b/bot/twitter_api/tweet_plot.py index b2e74257..7512d466 100644 --- a/bot/twitter_api/tweet_plot.py +++ b/bot/twitter_api/tweet_plot.py @@ -28,7 +28,7 @@ def __init__(self, testing=False, choice=None): """ Defines video tweet properties """ - # super().__init__() + super().__init__() # create a random GIF while True: manager = multiprocessing.Manager() From e402d6dcd13ccef653b49c9f5d19bd40d00451da Mon Sep 17 00:00:00 2001 From: Saransh Chopra Date: Wed, 2 Nov 2022 13:21:50 +0530 Subject: [PATCH 2/2] Resolve conflicts --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index ca37160d..802fc025 100644 --- a/.gitignore +++ b/.gitignore @@ -6,9 +6,6 @@ tempCodeRunnerFile.py plot.gif .coverage .ipynb_checkpoints -<<<<<<< Updated upstream plot*.png .DS_Store -======= .env ->>>>>>> Stashed changes