From c9f2753c7bfacfa659073403031d118bc259d20c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 14 Apr 2016 17:38:25 +0300
Subject: [PATCH] syncthing service: fix invalid conflict resolution

---
 nixos/modules/services/networking/syncthing.nix | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index a9198542ad6..a52f78cab26 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -113,22 +113,6 @@ in
         config.ids.gids.syncthing;
     };
 
-    systemd.services.syncthing =
-      {
-        description = "Syncthing service";
-        after    = [ "network.target" ];
-        wantedBy = [ "multi-user.target" ];
-        environment = {
-          STNORESTART = "yes";  # do not self-restart
-          STNOUPGRADE = "yes";
-          inherit (cfg) all_proxy;
-        } // config.networking.proxy.envVars;
-
-        serviceConfig = {
-          User  = cfg.user;
-          Group = cfg.group;
-    };
-
     environment.systemPackages = [ cfg.package ];
 
     systemd.services = mkIf cfg.systemService {