Conversation
|
@error401de when i pushed the code everything was alright, I promise 😁 (I read again the FAQ of the hacktoberfest and only the pullrequest labeled are accepted) |
…into logger_file � Conflicts: � checkTasks.py
|
@error401de I merged the branch again so there are no conflict :D |
|
@Paola351 If you look at the diff at https://github.com/error401de/recurring-tasks/pull/18/files you can see that e.g. line 8 would overwrite changes that has been made yesterday, so something is wrong with your rebasing. As you can see due to the insertion of the try except block, Github can't show the differences nicely anymore. Thats due to the fact that github diffs simply line-based. So overall: Line 8 needs to be changed in any case. For the rest I need some time to check it as the diff-issue doesn't let me do it easily. I'm not sure if i will be able to do that today. You already did a lot, so I will give you the |
You're right! Totally forgot that string! As there were so many conflicts, it took some time to solve them all and I forgot to check that part. I'm solving that right away:D |
No description provided.