summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--cat.py4
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 6dc20f4..0354969 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ oauth.txt
./oauth.txt
test_*
data/
+mastodon
diff --git a/cat.py b/cat.py
index 3eec4b8..d597470 100644
--- a/cat.py
+++ b/cat.py
@@ -101,6 +101,10 @@ class VnilCat:
status += "\n"
status += n["url"]
status += "\n\n"
+<<<<<<< HEAD
+=======
+ status += "randomly taken from - https://news.ycombinator.com/"
+>>>>>>> 95c5afd (chore)
self.session.toot(status)