closes https://github.com/cldf-datasets/phoible/issues/9

phoible / dev

PHOIBLE data and development.

https://phoible.org/

GNU General Public License v3.0

121 stars 30 forks source link

closes https://github.com/cldf-datasets/phoible/issues/9 #261

Closed bambooforest closed 4 years ago

drammock commented 4 years ago

@bambooforest I just merged #260 so this has a merge conflict now (presumably the RData file). can you rebase?

drammock commented 4 years ago

looks like the rebase worked, but also there are now no changes to phoible.RData showing in this PR. Did you forget to re-run the aggregation scripts (and git add / git commit the binary files) after the rebase?

drammock commented 4 years ago

I'll go ahead and merge this one without the updated .RData file, so you can rebase #262 against a version of master that has these changes in it.