diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-25 11:00:46 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-25 11:00:46 -0800 |
| commit | 471b8f71cd01176ad5deb1b1e6d8cec738d09d0c (patch) | |
| tree | 9dcbab745f8e28933d8f0ef5b7eff09b815f31f8 /etc/message.xml | |
| parent | 6ff6ed4d1148a66b188472c94b58bd573389942d (diff) | |
| parent | 1d512c599a8dfedcf93d7b1aadb8d85ad0d7de64 (diff) | |
Merge conflict resolution.
Diffstat (limited to 'etc/message.xml')
0 files changed, 0 insertions, 0 deletions