CVS difference for ai05s/ai05-0084-1.txt

--- ai05s/ai05-0084-1.txt	2008/11/27 00:12:21	1.5
+++ ai05s/ai05-0084-1.txt	2008/12/02 06:01:19	1.6
@@ -187,17 +187,18 @@
    @b<pragma> Preelaborate(Ordered_Sets);
    @b<pragma> Remote_Types(Ordered_Sets);>
 
-!corrigendum A.18.17(5/3)
+!corrigendum A.18.17
+!comment This is intended to force a conflict.
 
 @drepl
 @xcode<@b<generic>
-   @b<type> Element_Type (<>) @b<is private>;
+   @b<type> Element_Type (<@>) @b<is private>;
    @b<with function> "=" (Left, Right : Element_Type) @b<return> Boolean @b<is> <@>;
 @b<package> Ada.Containers.Indefinite_Holders @b<is>
    @b<pragma> Preelaborate (Indefinite_Holders);>
 @dby
 @xcode<@b<generic>
-   @b<type> Element_Type (<>) @b<is private>;
+   @b<type> Element_Type (<@>) @b<is private>;
    @b<with function> "=" (Left, Right : Element_Type) @b<return> Boolean @b<is> <@>;
 @b<package> Ada.Containers.Indefinite_Holders @b<is>
    @b<pragma> Preelaborate (Indefinite_Holders);