From 97e5072315debec01adc0372572cfdc3dafbfa11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 11 Nov 2015 15:54:13 +0100
Subject: [PATCH] Revert "preset disable tinyproxy by default"

This reverts commit f32dccb5e377203e7648c1099b6f7d299212176d.
Not needed anymore since dropin approach is implemented.
---
 vm-systemd/75-qubes-vm.preset | 2 --
 1 file changed, 2 deletions(-)

diff --git a/vm-systemd/75-qubes-vm.preset b/vm-systemd/75-qubes-vm.preset
index dd0f6c1..d60c552 100644
--- a/vm-systemd/75-qubes-vm.preset
+++ b/vm-systemd/75-qubes-vm.preset
@@ -30,8 +30,6 @@ disable plymouth-quit-wait.service
 disable smartd.service
 disable upower.service
 disable colord.service
-## conflicts with qubes-updates-proxy.service
-disable tinyproxy.service
 
 # Fedora only services
 disable backuppc.service