CVS difference for ai12s/ai12-0222-1.txt

Differences between 1.2 and version 1.3
Log of other versions for file ai12s/ai12-0222-1.txt

--- ai12s/ai12-0222-1.txt	2017/07/21 02:00:01	1.2
+++ ai12s/ai12-0222-1.txt	2017/07/21 03:41:49	1.3
@@ -118,16 +118,16 @@
 an @fa<aspect_specification> that specifies a representation or operational
 aspect of that entity.
 
-!corrigendum 13.1(9.2/5)
-
-@drepl
-An @fa<expression> or @fa<name> that freezes an entity shall not occur within
-an @fa<aspect_specification> that specifies a representation or operational
-aspect of that entity.
-@dby
-A representation aspect of a subtype or type shall not be specified (whether
-by a representation item or an @fa<aspect_specification>) before the type is
-completely defined (see 3.11.1).
+!comment !corrigendum 13.1(9.2/5) -- This paragraph is added by the conflict file; it can't appear here.
+!comment
+!comment @drepl
+!comment An @fa<expression> or @fa<name> that freezes an entity shall not occur within
+!comment an @fa<aspect_specification> that specifies a representation or operational
+!comment aspect of that entity.
+!comment @dby
+!comment A representation aspect of a subtype or type shall not be specified (whether
+!comment by a representation item or an @fa<aspect_specification>) before the type is
+!comment completely defined (see 3.11.1).
 
 
 !ASIS

Questions? Ask the ACAA Technical Agent