From 73a6d43a66a828b09e2c1b5a483405e6e0b5fa6a Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Thu, 24 Aug 2000 20:12:06 +0000 Subject: Fix minor conflicts. svn path=/trunk/; revision=5017 --- libical/design-data/prop-to-value.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'libical/design-data/prop-to-value.txt') diff --git a/libical/design-data/prop-to-value.txt b/libical/design-data/prop-to-value.txt index a06bdc31f1..4f4bf196ff 100644 --- a/libical/design-data/prop-to-value.txt +++ b/libical/design-data/prop-to-value.txt @@ -34,8 +34,7 @@ CREATED DATE-TIME DTSTAMP DATE-TIME LAST-MODIFIED DATE-TIME SEQUENCE INTEGER -X-LIC-ERROR TEXT -X-LIC-CLUSTERCOUNT INTEGER +X TEXT REQUEST-STATUS STRING ATTACH ATTACH # Non-std: URI or BINARY GEO GEO # Non-std: Two FLOATS @@ -48,3 +47,11 @@ RDATE DATE-TIME-PERIOD # Non-std: DATE-TIME or DATE or PERIOD TRIGGER TRIGGER # Non-std: DURATION or DATE-TIME DURATION DURATION QUERY QUERY +X-LIC-ERROR TEXT +X-LIC-CLUSTERCOUNT INTEGER +X-LIC-MIMECONTENTTYPE STRING +X-LIC-MIMECHARSET STRING +X-LIC-MIMEENCODING STRING +X-LIC-MIMEOPTINFO STRING +X-LIC-MIMECID STRING +X-LIC-MIMEFILENAME STRING -- cgit v1.2.3