Skip to content

Commit 71a2b79

Browse files
committed
Trying to work around a strange merge conflict
1 parent 2f3e098 commit 71a2b79

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

source/reflect.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,19 @@ namespace meta {
771771

772772
auto add_line {[&, _1 = lines](cpp2::in<std::string_view> s) mutable -> void{
773773
static_cast<void>(CPP2_UFCS(emplace_back)((*cpp2::assert_not_null(_1)), s, source_line::category::cpp2));
774+
}};
775+
776+
777+
778+
/*
779+
auto add_line {[&, _1 = lines](cpp2::in<std::string_view> s) mutable -> void{
780+
static_cast<void>(CPP2_UFCS(emplace_back, (*cpp2::assert_not_null(_1)), s, source_line::category::cpp2));
774781
}};
782+
*/
783+
784+
785+
786+
}};
775787
{
776788
auto newline_pos = CPP2_UFCS(find)(source, '\n');
777789

0 commit comments

Comments
 (0)