fix up conflicts in dev-config.sh

QuantEcon / Bookshelf

Code for the site QuantEconLib

1 stars 0 forks source link

Open AtlasMaxima-zz opened 4 years ago

AtlasMaxima-zz commented 4 years ago

There are unresolved conflicts from way back so please fix up the conflicts.