Commit Graph

1 Commits

Author SHA1 Message Date
Sebastian Thiel
c6d67daa81 fix(conflict): use latest gen/ from origin/master
that fixes a conflict when merging
2017-05-22 20:48:47 +02:00