Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
birgits committed Sep 20, 2019
2 parents e488ff5 + 00d2fde commit 6565303
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ shapely >= 1.5.12, <= 1.7
pypsa >= 0.11.0, <= 0.11.0
seaborn
unittest2
oedialect >= 0.0.6.dev0
oedialect == 0.0.6.dev0
geopandas
descartes
2 changes: 1 addition & 1 deletion rtd_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ egoio >=0.4.7
pypsa >=0.11.0, <=0.11.0
seaborn
unittest2
oedialect >= 0.0.6.dev0
oedialect == 0.0.6.dev0
mock


Expand Down

0 comments on commit 6565303

Please sign in to comment.