dgidb / dgidb-v5

Providing interactions between drugs and genes sourced from a variety of publications and knowledgebases
https://dgidb.org
MIT License
15 stars 2 forks source link

Fix merge conflicts of main to staging #429

Closed katiestahl closed 11 months ago

katiestahl commented 11 months ago

for the future, the only PRs that should ever be merged to staging are hotfixes and dev -> staging. This is to fix conflicting merges for changes that exist in both main and staging.