summaryrefslogtreecommitdiff
path: root/src/Propellor/Types.hs
diff options
context:
space:
mode:
authorJoey Hess2014-11-23 18:49:33 -0400
committerJoey Hess2014-11-23 18:49:33 -0400
commitf14749c1ccdaeb76beee74381d86f0bc4bc76b09 (patch)
tree5cff1489e97022ad227de288e470acfe0128df5c /src/Propellor/Types.hs
parent1695f5c678e5e64bc12252ee5b8ed75d1c5b5c49 (diff)
parent9d975e9ee4c44782da0815fb161ea8676dbf559c (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Types.hs')
-rw-r--r--src/Propellor/Types.hs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs
index 92b18cde..2f51b3e4 100644
--- a/src/Propellor/Types.hs
+++ b/src/Propellor/Types.hs
@@ -149,6 +149,7 @@ data CmdLine
| Edit PrivDataField Context
| ListFields
| AddKey String
+ | Merge
| Serialized CmdLine
| Continue CmdLine
| Update (Maybe HostName)