From 3bdd6411060dce095528239acc1812d4e7180371 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Fri, 30 Oct 2015 09:09:17 +0100
Subject: mismerge: fix installer

---
 installer/opentrack-installer.iss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss
index 8d909a22..3ed1a9e3 100644
--- a/installer/opentrack-installer.iss
+++ b/installer/opentrack-installer.iss
@@ -24,7 +24,7 @@ DefaultDirName={pf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
 OutputBaseFilename={#MyAppVersion}-setup
-SetupIconFile=..\facetracknoir\facetracknoir.ico
+SetupIconFile=..\gui\facetracknoir.ico
 Compression=lzma2/ultra64
 SolidCompression=yes
 DisableWelcomePage=True
-- 
cgit v1.2.3