tree 3e37f004d82147366f90a55570950efe1009d6ec
parent 7904774b5ea6925c2577fbec19372c48a875de86
author Andrew Pickford <anpickford@googlemail.com> 1524658038 +0200
committer Petr Michalec <epcim@apealive.net> 1525896747 +0200
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEhqQZrnIdUr29IpMXW423RAj5KWoFAlrzVisACgkQW423RAj5
 KWpI2Q//c4AQY7HX1KD1iKVpmHbUl9hrZADKzs0Yl4NGf5vEJD1Cl+PBGDgFKGB0
 BfDh8rWPsKRpYwHFU5+wjwsIztYWu8IEnSw7De8ElgoNGSnLdwmcwwMZDoZDafyj
 blDqoeHyCgx2UiaH+23klJ+SNIyrOf9cbQN/JbpPUxirqXYdcaWP3CdHw4OiTdsX
 +RkolY0Jv65DrDxnbNLr3mndmvq3WpdSENfY7ORu/+nwp/g/IIrlNH3EZbpKLw3d
 KAf3NOX4kbJXeRklY7jT1Nzp0blwOjdkUuL3woLWxdWaqAuxloicAz43yLlMZAIM
 5roNAVEJc1H0o/tPh5bxy9l6zbofCJBxPXj3TbcZsN004KIPEVqELqAKobafGRu2
 UBOHglCglD3TubwYueup5EUHeNke0TuE4QcFYJmDmnvSHMKVMGeBooolHO0hePFT
 ElCLcHXTfjznh+5KvfLnE3MeF/ftU9UzPiz1+LKzbQO/uDWcbpjWoWcWy3go7jzC
 7Una0DTKLJbooW7y2KDDCEKDTNTnioVKDLQqWAE0ch2ZLq/FSiqUS6hKqPXCaL0J
 lfZG7LcBQdPVD9GanBv+WuDuqq6QksTKGoKv+t0Q1QHJdNEGHN2slem6y8s22jEl
 sqZTqyXyum1UgiNgvo9lDlbgZmTiYcSCNy7aEn0id1USKS/P1G0=
 =vCEb
 -----END PGP SIGNATURE-----

Implement merge_over method for CompItem class

Required for overwriting escaped strings with either another escaped
string or a scalar. As CompItem objects render as strings the merge_over
method is the same as for ScalarItem objects