-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi Holger,
Am Donnerstag, den 18.08.2016, 14:47 +0000 schrieb Holger Levsen: > > > unfortunatly I get merge conflicts when I try merging the experimental > git branch into master, and I really lack the time atm to resolve those… > > could you please have a look? done so, I think. ;) Thanks! - Fabian -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXtg2hAAoJEMvqjpcMzVnfO4wP/1w1kRT1wQ9RaSRxRvNEsDit XL7xgRJheOdBN+tKQaRgVvXdRlGotpYjyqIXnjJE0bsobwVtsNDWjDuBRTBQ+/nP SUz+/iHIA0U0v4zyp4IcKhrVB7fjhdnFa+Boye/HJbOT5lq62NLLFbJ1RgZ8/WhK TnEyePfGVa848laRfgDB+2hkTm+3vN5k6hcdWagzV8UWAuWg3yC343VdjDl1EpYn CFdb72+Fx5L0Axe5Em0hp11fUoADgfR7e/GYfhfgLRv/w1Cu6FANw6pT7Q3uTTJn pNrprEtT+wXAe7pGJyj+++lAeh9vunOvuso14qHGBRNVYgvwMlYhVZpYMzEuJrTc SEL3PSON9GzKpkr+ZdOfnxheu/sMmAevm/PBsXu+jJS0EkV9tr91IA91OCmfE45R bCHNoEtE7ceKkXxwxAjPSBlMAxuHTrXQfIamGHQ6LU9c52KvM2F7UYhtDEDNmZ8v SNXJ919v92b58UwHgc03FN7PXumbLXrEo0ClEjnz6WHvIJRJMKP798oIjBeLAPNz SgnZsIIfifnv+s9WjDur4htz2EDfzTMgVnBiki+uu9odPr7aIyYXvFDNxUV/Gade scERJOpNaLHHeAAlXlEJ1Pbex5zCb5DYgb/BktNX2s7fPnTpXtdPAsSnifdJvR7t vYe/2YJTP6C7R3Dm6Ukv =KkEH -----END PGP SIGNATURE-----
