Commit 9ae9f3df authored by Nicolas Joyard's avatar Nicolas Joyard

Remove persisting merge conflict line

parent 2e8a891c
sudo: false sudo: false
<<<<<<< HEAD
env: env:
global: global:
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