diff options
| author | Michael VanOverbeek <[email protected]> | 2016-07-25 12:54:08 -0400 |
|---|---|---|
| committer | Michael VanOverbeek <[email protected]> | 2016-07-25 12:54:08 -0400 |
| commit | 6fa16209519896de09949a27425dff00ebf2970a (patch) | |
| tree | f00af7ea3f6ad2641fb26fa1d310fd8b7179b39c /source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.resx | |
| parent | 401ae1bb353887a2b90a3dbf53b8913dc84d70a9 (diff) | |
| parent | af48e774189596b8d7a058c564a7d6d75205ca03 (diff) | |
| download | shiftos-c--6fa16209519896de09949a27425dff00ebf2970a.tar.gz shiftos-c--6fa16209519896de09949a27425dff00ebf2970a.tar.bz2 shiftos-c--6fa16209519896de09949a27425dff00ebf2970a.zip | |
Merge remote-tracking branch 'refs/remotes/origin/master' into shiftui_integration
Diffstat (limited to 'source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.resx')
| -rw-r--r-- | source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.resx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.resx b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.resx index 3877945..d28073f 100644 --- a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.resx +++ b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.resx @@ -120,9 +120,6 @@ <metadata name="desktopappmenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> - <metadata name="desktopappmenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>17, 17</value> - </metadata> <metadata name="clocktick.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>164, 17</value> </metadata> |