summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-08 10:56:32 -0400
committerOz Linden <oz@lindenlab.com>2011-08-08 10:56:32 -0400
commitf30680cce995ff8fd980101f75b8d69377116b7f (patch)
tree43acaa3820c9e0d7bfe7ebc297e7b729c62bf604 /.hgignore
parent09dc3fd81bbd927d389cf8a699bb2dfe67e7b820 (diff)
correct merge-induced error in settings.xml
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions