Merge: commit on master is newer than develop

crest-cassia / oacis_docker

Dockerfile for OACIS

5 stars 3 forks source link

Closed takeshi-uchitane closed 8 years ago

takeshi-uchitane commented 8 years ago

pull request #43 is merged into master instead of develop
- this commit should be merged into develop instead of master
try merge from master to develop