nulib / avalon

Variations-on-Video Hydra app
Apache License 2.0
3 stars 0 forks source link

UI fixes for #244 #250 #266 #270 #271 #273

Closed adamjarling closed 7 years ago

adamjarling commented 7 years ago

Seems it's not happy with the automatic merge now. Does it look ok to you? I did a force push to the same remote feature branch. Maybe now it's ahead, and that's why it's complaining?