summaryrefslogtreecommitdiff
path: root/indra/newview/installers/windows/lang_en-us.nsi
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-05-31 17:51:51 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2019-05-31 17:51:51 +0300
commit1b793f5c10e9f74d66ccbf0d085e169e61e1a592 (patch)
tree47bd6cea4a3c326a14c5077321e481761abf2d0f /indra/newview/installers/windows/lang_en-us.nsi
parent0c84313a000ff3589cef92fb8ba151ee14a51f58 (diff)
SL-11323 Bad merge fix and cleanup
Diffstat (limited to 'indra/newview/installers/windows/lang_en-us.nsi')
-rw-r--r--indra/newview/installers/windows/lang_en-us.nsibin11488 -> 11434 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
index fd4d340816..ea680f08e4 100644
--- a/indra/newview/installers/windows/lang_en-us.nsi
+++ b/indra/newview/installers/windows/lang_en-us.nsi
Binary files differ