diff options
| author | Michael <[email protected]> | 2017-05-23 20:36:16 -0400 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-05-23 20:36:16 -0400 |
| commit | 44a4de1c173a0ab88ff3aa519b3a25888f2eff85 (patch) | |
| tree | 005bd432271a8f004cbd8762cef0727f32602829 /ShiftOS.WinForms/Resources | |
| parent | 660c42a19c831b9768d7bb6845b22474459a311e (diff) | |
| download | shiftos_thereturn-44a4de1c173a0ab88ff3aa519b3a25888f2eff85.tar.gz shiftos_thereturn-44a4de1c173a0ab88ff3aa519b3a25888f2eff85.tar.bz2 shiftos_thereturn-44a4de1c173a0ab88ff3aa519b3a25888f2eff85.zip | |
web browser + fix shiftorium merge conflict
Diffstat (limited to 'ShiftOS.WinForms/Resources')
| -rw-r--r-- | ShiftOS.WinForms/Resources/Shiftorium.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt index 4bd2e8d..cc68c6f 100644 --- a/ShiftOS.WinForms/Resources/Shiftorium.txt +++ b/ShiftOS.WinForms/Resources/Shiftorium.txt @@ -8,8 +8,6 @@ Category: "Enhancements", }, { -<<<<<<< HEAD -======= Name: "Shift Progress Bar", Cost: 150, Description: "Want to customize the look of all ShiftOS Progress Bars? Buy this upgrade today and you'll get the ability to set the foreground and background color of the progress bar, and many more things!.", @@ -24,7 +22,6 @@ Category: "Customization" }, { ->>>>>>> 9999324bd7751f536741c108322766421dae1a52 Name: "GUI Based Login Screen", Cost: 500, Description: "Tired of using the text-based login screen in ShiftOS? Well, we have a functioning window manager, and a functioning desktop, why not use these tools to create a functioning and awesome-looking login screen?", |