2 Commits

Author	SHA1	Message	Date
Tim 'mithro' Ansell	3b13f8734f	Fix indenting in mergedb.py ... Fixes #467. Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>	2019-01-08 18:23:25 -08:00
John McMaster	d0d6778826	mergedb: proper merge script ... Signed-off-by: John McMaster <johndmcmaster@gmail.com>	2019-01-08 15:49:35 +01:00