summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2023-08-23 14:12:01 -0700
committerBrad Linden <brad@lindenlab.com>2023-08-23 14:12:01 -0700
commit167bf822acd51c68bb4812b77eacc7dc5e00105a (patch)
tree06ccd052ec7cb26c320b439660af3554bd33323f /indra/newview
parentc6d5f11f63dfa0ac65a2afebf88b3078f571e044 (diff)
Fix merge breakage in windows installer_templete.nsi for DRTVWR-559
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/installers/windows/installer_template.nsi3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 599e5a0fa4..39247b3f47 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -518,10 +518,7 @@ Function CheckIfAdministrator
Quit
lbl_is_admin:
Return
-/* Unused
-
FunctionEnd
-*/
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Function CheckWillUninstallV2