5 Commits

Author	SHA1	Message	Date
Cayo Puigdefabregas	91848a548c	deactivate manual merge	2021-02-11 20:38:18 +01:00
Cayo Puigdefabregas	86f37d0cf1	test of merge 2 devices with 2 diferents tags one for device	2020-11-09 16:32:06 +01:00
Cayo Puigdefabregas	5717743d2f	bug for moving tags	2020-10-28 22:15:04 +01:00
Cayo Puigdefabregas	0106728e4f	complet test for basic manual merge	2020-10-28 13:29:45 +01:00
Cayo Puigdefabregas	889ee84f6a	base of test merge	2020-10-27 19:14:23 +01:00