diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-04 01:38:01 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-04 01:38:01 -0400 |
| commit | 336e3ccf84c50ecf41fe0212b7abc5d93947da5e (patch) | |
| tree | 1fb55e3653717bd7e5431a4c4e78bc6f3d01bdb6 /config.hs | |
| parent | 2e2f4ac91369adf39fed54df10864f320a8227c1 (diff) | |
| parent | 25a002605056ca5b3ad93c038b424c952f1431d1 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
config.hs
Diffstat (limited to 'config.hs')
| l--------- | config.hs | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -Propellor/Config/Simple.hs
\ No newline at end of file +config-simple.hs
\ No newline at end of file |