err
Merge branch 'master' of ssh://katfs/home/adam/spead
local
Merge branch 'master' of ssh://katfs/home/adam/spead

Conflicts:
	src/Makefile
Merge branch 'master' of ssh://katfs/home/adam/spead
Merge branch 'master' of ssh://katfs/home/adam/spead
sda
Merge branch 'master' of ssh://katfs/home/adam/spead
Merge branch 'master' of ssh://katfs/home/adam/spead
Merge branch 'master' of ssh://katfs/home/adam/spead
Merge branch 'master' of ssh://katfs/home/adam/spead
Merge branch 'master' of ssh://katfs/home/adam/spead
Merge branch 'master' of ssh://katfs/home/adam/spead
Merge branch 'master' of ssh://katfs/home/adam/spead
Merge branch 'master' of ssh://katfs/home/adam/spead
Merge branch 'master' of ssh://katfs/home/adam/spead
 loco
Merge branch 'master' of ssh://katfs/home/adam/spead

Conflicts:
	src/Makefile
Merge branch 'master' of ssh://katfs/home/adam/spead

Conflicts:
	src/Makefile
loc