summaryrefslogtreecommitdiff
path: root/doc/todo/type_level_port_conflict_detection.mdwn
diff options
context:
space:
mode:
authorJoey Hess2016-03-07 16:36:36 -0400
committerJoey Hess2016-03-07 16:36:36 -0400
commit16a95afa2fe22a4df9c371489c4ee7ffdef8e07b (patch)
tree6e0869e78aba03be2591569369e1e099bb86568e /doc/todo/type_level_port_conflict_detection.mdwn
parent9bbc292b3f903a1476e3524bb9198e58ce300401 (diff)
parent822694e790102efa2a5bb4a0c3d62c6fce1d4e87 (diff)
Merge remote-tracking branch 'remotes/misandrist/FreeBSD' into wip
Diffstat (limited to 'doc/todo/type_level_port_conflict_detection.mdwn')
-rw-r--r--doc/todo/type_level_port_conflict_detection.mdwn3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/todo/type_level_port_conflict_detection.mdwn b/doc/todo/type_level_port_conflict_detection.mdwn
index 6708ac3a..47d5f0cf 100644
--- a/doc/todo/type_level_port_conflict_detection.mdwn
+++ b/doc/todo/type_level_port_conflict_detection.mdwn
@@ -4,4 +4,7 @@ Needs ghc newer than 7.6.3. It may be possible to port Data.Type.Equality
and Data.Type.Bool to older versions; I got them to compile but they didn't
work right. --[[Joey]]
+I have a `resourceconflict` branch that adds this in Propellor.Resources,
+but it is not yet integrated into the Property types. --[[Joey]]
+
[[!tag user/joey]]