branches.md: 'documentation' replaces 'documentation-fixups'
branches.md: 'documentation' replaces 'documentation-fixups'

(also removed a stray conflict marker that I must have missed earlier.)

Igalia/snabb,SnabbCo/snabbswitch,kbara/snabb,dpino/snabbswitch,mixflowtech/logsensor,dpino/snabbswitch,mixflowtech/logsensor,kbara/snabb,mixflowtech/logsensor,dpino/snabb,alexandergall/snabbswitch,eugeneia/snabb,snabbco/snabb,wingo/snabb,eugeneia/snabb,dpino/snabbswitch,snabbco/snabb,Igalia/snabb,snabbco/snabb,dpino/snabb,Igalia/snabb,heryii/snabb,eugeneia/snabbswitch,eugeneia/snabbswitch,dpino/snabb,mixflowtech/logsensor,alexandergall/snabbswitch,eugeneia/snabb,Igalia/snabbswitch,kbara/snabb,wingo/snabbswitch,wingo/snabb,Igalia/snabbswitch,wingo/snabbswitch,dpino/snabbswitch,heryii/snabb,SnabbCo/snabbswitch,Igalia/snabbswitch,snabbco/snabb,dpino/snabb,SnabbCo/snabbswitch,eugeneia/snabb,heryii/snabb,dpino/snabb,wingo/snabbswitch,alexandergall/snabbswitch,wingo/snabb,snabbco/snabb,eugeneia/snabbswitch,snabbco/snabb,snabbco/snabb,Igalia/snabb,Igalia/snabbswitch,Igalia/snabbswitch,alexandergall/snabbswitch,Igalia/snabb,Igalia/snabb,kbara/snabb,kbara/snabb,dpino/snabb,alexandergall/snabbswitch,eugeneia/snabb,wingo/snabb,wingo/snabbswitch,SnabbCo/snabbswitch,eugeneia/snabb,heryii/snabb,kbara/snabb,eugeneia/snabb,wingo/snabb,heryii/snabb,heryii/snabb,mixflowtech/logsensor,Igalia/snabb,alexandergall/snabbswitch,dpino/snabb,eugeneia/snabb,snabbco/snabb,wingo/snabb,eugeneia/snabbswitch,alexandergall/snabbswitch,Igalia/snabb,alexandergall/snabbswitch