modified: usr/bin/bsdlfeeds.py -> rm diff traces |

modified: usr/home/.bash_aliases src well implemented
2026-02-23 20:26:40 +01:00
parent 10eb0fa915
commit 4deb2f2b8f
2 changed files with 3 additions and 8 deletions
@@ -59,11 +59,7 @@ def main():
    args = parser.parse_args()

    client = connect()
-<<<<<<< HEAD
    profile = get_feeds(client, args.handle, args.folder, cursor=cursor)
-=======
-    profile = get_feeds(client, args.handle, args.folder)
->>>>>>> 01ee0aacb9e93bd6572ab9049f26878733f8bf85