merge conflict resolution broke #14

chendaniely / ebola

Data for the 2014 ebola outbeak in West Africa

Other

2 stars 1 forks source link

Open chendaniely opened 9 years ago

chendaniely commented 9 years ago

please review changes form merge conflict resolution

c313ae695852bde804696c8248186a06df6ff989 (merging #13) broke #14

chendaniely commented 9 years ago

this was because I merged #14 first, then fixed conflicts on #13, should be fixed by rebasing 84a7acf80051f6cecc62c58b58d72f4807994544