cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'joeyconfig' 

Conflicts:
	config.hs
This commit is contained in:
Joey Hess 2014-04-04 01:38:01 -04:00
parent 2e2f4ac913 25a0026050
commit 336e3ccf84
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Propellor/Config/Joey.hs → config-joey.hs
View File

@ -1,7 +1,5 @@
-- | This is the live config file used by propellor's author. -- | This is the live config file used by propellor's author.
module Propellor.Config.Joey where
import Propellor import Propellor
import Propellor.CmdLine import Propellor.CmdLine
import qualified Propellor.Property.File as File import qualified Propellor.Property.File as File

2
Propellor/Config/Simple.hs → config-simple.hs
View File

@ -1,8 +1,6 @@
-- | This is the main configuration file for Propellor, and is used to build -- | This is the main configuration file for Propellor, and is used to build
-- the propellor program. -- the propellor program.
module Propellor.Config.Simple where
import Propellor import Propellor
import Propellor.CmdLine import Propellor.CmdLine
import qualified Propellor.Property.File as File import qualified Propellor.Property.File as File

2
config.hs
View File

@ -1 +1 @@
Propellor/Config/Simple.hs config-simple.hs

2
propellor.cabal
View File

@ -15,6 +15,8 @@ Extra-Source-Files:
TODO TODO
CHANGELOG CHANGELOG
Makefile Makefile
config-simple.hs
config-joey.hs
debian/changelog debian/changelog
debian/README.Debian debian/README.Debian
debian/propellor.1 debian/propellor.1