Changeset a4da45e for src/AST/Attribute.hpp

Timestamp:

Feb 26, 2024, 3:53:42 AM (19 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

3f9a8d0

Parents:

0522ebe (diff), 022bce0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• src/AST/Attribute.hpp (modified) (2 diffs)

src/AST/Attribute.hpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Fri May 10 10:30:00 2019
-// Last Modified By : Aaron B. Moss
+// Last Modified By : Peter A. Buhr
 // Created On       : Fri May 10 10:30:00 2019
-// Update Count     : 1
+// Update Count     : 2
 //
 
@@ -34 +34 @@
 
         Attribute( const std::string & name = "", std::vector<ptr<Expr>> && params = {})
-        : name( name ), params( params ) {}
+                : name( name ), params( params ) {}
         virtual ~Attribute() = default;