Yeedo f1e268986b cargo fmt, also remove a stray <<<<HEAD thing
Former-commit-id: 2be13ebd752d8f90fb22358597878dc8dd8df1ef
2019-04-29 22:23:31 +01:00
..
2019-03-20 01:24:21 -04:00