Zero Percent Release for Merging Beta version 1.5 to Master version 1.6

kdahlquist / GRNmap

Gene Regulatory Network modeling and parameter estimation

BSD 3-Clause "New" or "Revised" License

4 stars 3 forks source link

Zero Percent Release for Merging Beta version 1.5 to Master version 1.6 #318

Closed trixr4kdz closed 7 years ago

trixr4kdz commented 7 years ago

There are some merge conflicts that we will have to resolve before merging beta into master.

kdahlquist commented 7 years ago

I just wanted to note that we added to the documents directory on master for the abstracts and posters, but that doesn't seem to have conflicted. Please double-check that the most recent versions of those files (from master) are the ones that are preserved in the merge.