From: Frank Brehm <frank@brehm-online.com>
Date: Fri, 26 Feb 2016 10:27:06 +0000 (+0100)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=cb320514f802c0fce37a6b9421d4376d770ddf32;p=config%2Fbruni%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index 79661f08..f83454b0 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-02-25 08:30
+# Written by cupsd on 2016-02-26 08:29
 NextSubscriptionId 248
 <Subscription 246>
 Events all
@@ -7,6 +7,6 @@ Owner anonymous
 Recipient dbus://
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1456471769
+ExpirationTime 1456558110
 NextEventId 179
 </Subscription>
diff --git a/portage/package.keywords b/portage/package.keywords
index c1cb4137..8c2b7918 100644
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -47,6 +47,8 @@ app-misc/ddate
 ~app-text/mate-document-viewer-1.6.2
 ~app-text/mate-doc-utils-1.6.2
 
+~app-vim/salt-vim-20151119
+
 ~dev-db/sqlite-3.8.5
 ~dev-db/sqlite-3.9.2
 ~dev-db/virtuoso-odbc-6.1.4