Fixed merge issues

1 files changed, 2 insertions, 2 deletions

diff --git a/Source/Dafny/Resolver.cs b/Source/Dafny/Resolver.cs
index 2af9729b..0a6690fb 100644
--- a/Source/Dafny/Resolver.cs
+++ b/Source/Dafny/Resolver.cs
@@ -5369,7 +5369,7 @@ namespace Microsoft.Dafny
       } else {

         ResolveUpdateStmt(update, specContextOnly, codeContext, errorCountBeforeCheckingLhs);

       }

-      ResolveAttributes(s.Attributes, new ResolveOpts(codeContext, true));

+      ResolveAttributes(s.Attributes, new ResolveOpts(codeContext, true, true));

     }

     /// <summary>

     /// Resolve the RHSs and entire UpdateStmt (LHSs should already have been checked by the caller).

@@ -7066,7 +7066,7 @@ namespace Microsoft.Dafny
           }

         }

         ResolveExpression(e.Body, opts);

-        ResolveAttributes(e.Attributes, opts);

+        ResolveAttributes(e.Attributes, new ResolveOpts(opts, true));

         scope.PopMarker();

         expr.Type = e.Body.Type;