Integrate changes from libcce/Top-10-FAIR (fix #7)

LibraryCarpentry / Top-10-FAIR

Top 10 FAIR Data & Software Things

https://librarycarpentry.org/Top-10-FAIR/

Other

32 stars 4 forks source link

Integrate changes from libcce/Top-10-FAIR (fix #7) #8

Closed katrinleinweber closed 5 years ago

katrinleinweber commented 5 years ago

This resolves a merge conflict between LibraryCarpentry/Top-10-FAIR and libcce/Top-10-FAIR in the last line about ("Reaching out to #datalibs..."). Because I don't have write access here, and opening a PR between those two repos didn't work directly, I'm "de-touring" this via my fork.

@libcce: Please check these changes for correctness, and best use either the squash or rebase merge option to avoid adding the 4th merge commit that this PR would normally create.

libcce commented 5 years ago

Thanks @katrinleinweber I'm using the squash and merge as you suggested. Sorry for taking so long. Would you say that we can now remove the Top-10-FAIR in libcce?

katrinleinweber commented 5 years ago

Yes, I'm pretty sure. You can verify by comparing the diff to your fork with that of c97258181e7bf2fdea5b14511b53e8ae2a7933e6.

Same content, except for @ragamouf's authorship. Didn't consider the fact that squashing would lose that, I'm sorry! GitHub adding me as the author really doesn't make sense, since I only created the PR and 1 of the commits in it :-/