Skip to content

Commit aa3d7ba

Browse files
committed
python: fix bad merge
caused by an optimistic attempt at solving a merge conflict in the online GUI.
1 parent 6c3e2db commit aa3d7ba

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

python/ql/test/experimental/meta/ConceptsTest.qll

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,9 @@ class CsrfLocalProtectionSettingTest extends InlineExpectationsTest {
570570
if p.csrfEnabled()
571571
then tag = "CsrfLocalProtectionEnabled"
572572
else tag = "CsrfLocalProtectionDisabled"
573+
)
574+
}
575+
}
573576

574577
class XmlParsingTest extends InlineExpectationsTest {
575578
XmlParsingTest() { this = "XmlParsingTest" }

0 commit comments

Comments
 (0)