Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-04-19 17:28:22 -04:00
commit e834446c5d
1 changed files with 2 additions and 2 deletions

View File

@ -85,7 +85,7 @@ you read through it, it's remarkably precise about what and where the problem
is. is.
<pre> <pre>
config-simple.hs:30:19: config.hs:30:19:
Couldn't match expected type `RevertableProperty' Couldn't match expected type `RevertableProperty'
with actual type `Property' with actual type `Property'
In the return type of a call of `Apt.installed' In the return type of a call of `Apt.installed'
@ -100,7 +100,7 @@ Similarly, if you make a typo in the config file, you'll probably get a long
but informative error message. but informative error message.
<pre> <pre>
config-simple.hs:27:19: config.hs:27:19:
Not in scope: `Apt.standardSourcesList' Not in scope: `Apt.standardSourcesList'
Perhaps you meant one of these: Perhaps you meant one of these:
`Apt.stdSourcesList' (imported from Propellor.Property.Apt) `Apt.stdSourcesList' (imported from Propellor.Property.Apt)