# HG changeset patch
# User anatofuz
# Date 1579239446 -32400
# Node ID de3934dd522abfdb51988e0ecc356c0da3c5ff02
# Parent  8c12438a9827bfddf53a5e8f53a31053e2985cbd# Parent  b948cf7a881d3155719bd37d363cf0697fffa7d5
merge

diff -r 8c12438a9827 -r de3934dd522a src/gearsTools/lib/Gears/Context/Template/XV6.pm