diff options
| author | pfg github <[email protected]> | 2015-03-16 07:34:26 -0700 |
|---|---|---|
| committer | pfg github <[email protected]> | 2015-03-16 07:34:26 -0700 |
| commit | 3fbfbbdb0e9bfe2a9c6c0b79b873189a1bc96314 (patch) | |
| tree | 614bc4b471ed9b2d91626c03cbb3f20a4f1894ee /ShiftOS/skins.vb | |
| parent | afbd2926d0d336cb608d40490c1188baf88d623d (diff) | |
| download | shiftos-3fbfbbdb0e9bfe2a9c6c0b79b873189a1bc96314.tar.gz shiftos-3fbfbbdb0e9bfe2a9c6c0b79b873189a1bc96314.tar.bz2 shiftos-3fbfbbdb0e9bfe2a9c6c0b79b873189a1bc96314.zip | |
commented if statememt and fixed the build conflict. There is a tutorial in the dev room on how to fix them
Diffstat (limited to 'ShiftOS/skins.vb')
| -rw-r--r-- | ShiftOS/skins.vb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ShiftOS/skins.vb b/ShiftOS/skins.vb index e2c4f24..b6cbd2d 100644 --- a/ShiftOS/skins.vb +++ b/ShiftOS/skins.vb @@ -420,13 +420,6 @@ Module Skins If loaddata(117) = "" Then startHeight = 526 Else startHeight = loaddata(117) If loaddata(118) = "" Then startWidth = 320 Else startWidth = loaddata(118) If loaddata(119) = "" Then shutdownstring = "Shut Down ShiftOS" Else shutdownstring = loaddata(119) -<<<<<<< HEAD - If loaddata(120) = "" Then userNamePosition = "Middle, Right" Else userNamePosition = loaddata(120) - If loaddata(121) = "" Then recentIconsHorizontal = False Else recentIconsHorizontal = loaddata(121) - If loaddata(122) = "" Then usernametextcolor = Color.White Else usernametextcolor = Color.FromArgb(loaddata(122)) - If loaddata(123) = "" Then usernamefont = "Trebuchet MS" Else usernamefont = loaddata(123) - If loaddata(124) = "" Then usernamefontsize = 12 Else usernamefontsize = loaddata(124) -======= If loaddata(120) = "" Then userNamePosition = "Middle, Right" Else userNamePosition = loaddata(200) Try If loaddata(121) = "" Then recentIconsHorizontal = False Else recentIconsHorizontal = loaddata(201) @@ -439,7 +432,6 @@ Module Skins recentIconsHorizontal = False usernamefontsize = 12 End Try ->>>>>>> origin/master If loaddata(125) = "" Then usernamefontstyle = FontStyle.Bold Else usernamefontstyle = loaddata(125) If loaddata(126) = "" Then userNamePanelBackgroundColor = Color.Gray Else userNamePanelBackgroundColor = Color.FromArgb(loaddata(126)) If loaddata(127) = "" Then powerPanelBackgroundColor = Color.Gray Else powerPanelBackgroundColor = Color.FromArgb(loaddata(127)) |