Commit ffd20f24 authored by canterburym's avatar canterburym
Browse files

Adding trial merge test

parent b2aeb934
Pipeline #3129 passed with stages
in 1 minute and 13 seconds
......@@ -7,6 +7,7 @@ stages:
- Syntax
- Lint
- Compile
- MergeTest
parseASN1:
stage: Syntax
......@@ -30,3 +31,8 @@ compileASN1:
- python3 testing/compile_asn1.py
allow_failure: true
MergeTest:
stage: MergeTest
script:
- python3 testing/merge_test.py
allow_failure: true
print ("Hello world")
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment