summaryrefslogtreecommitdiff
path: root/scripts/messages/message_template.msg
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-03-23 22:34:34 -0400
committerOz Linden <oz@lindenlab.com>2015-03-23 22:34:34 -0400
commit794ae5cdcadcfaa655815bfa1e6c6823e03ee1f6 (patch)
treedf04ccbc14141952e12797fb5d7860fae4eaf18a /scripts/messages/message_template.msg
parent8e21b24a079684304b02485d8f28e9be8f16e6a0 (diff)
correct merge error
Diffstat (limited to 'scripts/messages/message_template.msg')
0 files changed, 0 insertions, 0 deletions