From: Frank Brehm <frank@brehm-online.com>
Date: Fri, 18 Mar 2016 02:10:04 +0000 (+0100)
Subject: daily autocommit
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=d3e2eaefb93b82c0b66081827d54c469527fc9c7;p=config%2Fbruni%2Fetc.git

daily autocommit
---

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index 46fef2d0..a7400405 100644
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,5 +1,5 @@
 # Subscription configuration file for CUPS v2.0.3
-# Written by cupsd on 2016-03-16 08:10
+# Written by cupsd on 2016-03-17 08:09
 NextSubscriptionId 250
 <Subscription 249>
 Events all
@@ -7,6 +7,6 @@ Owner anonymous
 Recipient dbus://
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1458198593
+ExpirationTime 1458284933
 NextEventId 1
 </Subscription>
diff --git a/resolv.conf b/resolv.conf
index 8a53d6bf..9076c0f3 100644
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,5 +1,5 @@
 # Generated by net-scripts for interface eth0
 domain brehm-online.com
 search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de
-nameserver 10.12.11.254
-#nameserver 127.0.0.1
+#nameserver 10.12.11.254
+nameserver 127.0.0.1