summaryrefslogtreecommitdiff
path: root/debian/README.Debian
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2014-08-19 16:40:31 -0400
committerJoey Hess <joey@kitenet.net>2014-08-19 16:40:31 -0400
commit16c01b24ceb0a67af913ada32f945ab67899be66 (patch)
tree944b8a09f37ac71509c985379e720f2497f83c3d /debian/README.Debian
parentc57ff0cb463f9acd1a0aa0d11a2bbaad75d361be (diff)
parent3c61c109fbba19fb5c41870333f879fdc6dc0c1a (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian/README.Debian')
-rw-r--r--debian/README.Debian3
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/README.Debian b/debian/README.Debian
index fe187841..851add5d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -10,4 +10,5 @@ Note that upgrading the propellor package will not update your
~/.propellor/ repository. This is because you may have local changes
to the source, or may need to adapt your config.hs to work with the new
version of propellor. Instead, if your ~/.propellor/ is from an older
-version of propellor, /usr/bin/propellor will warn that it's out of date.
+version of propellor, /usr/bin/propellor will warn that it's out of date,
+and tell you how to merge in the changes.