search

Priesemann-Group / covid19_inference

Bayesian python toolbox for inference and forecast of the spread of the Coronavirus
GNU General Public License v3.0
73 stars 70 forks source link

migrated SEIR function from other rep #15

Closed emilIftekhar closed 4 years ago

jdehning commented 4 years ago

@emilIftekhar it is saying that it has conflicts. Try to solve them, there are some tutorials for it, for example https://www.digitalocean.com/community/tutorials/how-to-rebase-and-update-a-pull-request

jdehning commented 4 years ago

There are still problems, that the file model.py gets completely rewritten, with an old version of it. See files changed, at the top bar.

emilIftekhar commented 4 years ago

Ok, I am sorry. I will check again where the differences are...

Am Dienstag, 21. April 2020, 12:45:31 MESZ hat jdehning <notifications@github.com> Folgendes geschrieben:

There are still problems, that the file model.py gets completely rewritten, with an old version of it. See files changed, at the top bar.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or unsubscribe.

jdehning commented 4 years ago

There are still problems, that the file model.py gets completely rewritten, with an old version of it. See files changed, at the top bar.

Sorry, my bad. When one ticks hide whitespace changes in the difference view, it does not show the whole file as new.