222bec2 only import the api when required d41040c add telegram bot 78b0bc5 add pip requirements.txt 18d9714 remove hardcoded screen_name 55e7bb1 oopsie a610858 testing thinner stroke 55d067f oopsie c51401e higher resolution masks 12c311d typo 2406c0c make hashtags searchable e673f29 remove parsing logic from the twitter bot 6bb3da6 clean up requests code 81afb4b ignore all json files now 3aeb274 clean incoming text before feeding it to the parser ddc1afd allow to specify a custom config file d8d28cb basic logging ====================== p e673f29 s 55d067f s 55e7bb1 ====================== error: could not apply e673f29... remove parsing logic from the twitter bot When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort". Could not apply e673f29afd7ebc65e1a1389a0a767ef7ec86b4e1... e673f29