diff options
| author | Kenneth Skovhede <kenneth@hexad.dk> | 2016-04-13 12:46:49 +0300 |
|---|---|---|
| committer | Kenneth Skovhede <kenneth@hexad.dk> | 2016-04-13 12:46:49 +0300 |
| commit | b77499f8e2fea9a43d95f261a91de22f2060264a (patch) | |
| tree | ae08438c86a01e6bdaed67439ecb08ff31b87418 /Duplicati/Service | |
| parent | 020471bb2a7cbc1021b9d280c8e575f4a3a1673e (diff) | |
| parent | d1c7fdab5f57754fb55c50e5fbdbb509ff2e918f (diff) | |
Merge branch 'master' into feature/windows_service
# Conflicts:
# Duplicati.sln
# Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
Diffstat (limited to 'Duplicati/Service')
| -rw-r--r-- | Duplicati/Service/Duplicati.Service.csproj | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Duplicati/Service/Duplicati.Service.csproj b/Duplicati/Service/Duplicati.Service.csproj index 341a538a0..9f3a85209 100644 --- a/Duplicati/Service/Duplicati.Service.csproj +++ b/Duplicati/Service/Duplicati.Service.csproj @@ -3,8 +3,6 @@ <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.30703</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{E93F3DE2-FF3A-4709-96A3-8190AA14FA25}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>Duplicati.Service</RootNamespace>
|