Removes the merge conflict remains

parent b6c0b663
Pipeline #1501 passed with stage
in 0 seconds
......@@ -31,12 +31,8 @@
<a href="https://www.openrightsgroup.org/" target="_blank" title="Open Rights Group"><img src="/wp-content/images/logos/org.svg" alt="Open Rights Group"></a>
<a href="https://www.digitalrights.ie/" target="_blank" title="Digital Rights Ireland"><img src="/wp-content/images/logos/dri.png" alt="Digital Rights Ireland"></a>
<a href="https://www.privacyinternational.org/" target="_blank" title="Privacy International"><img src="/wp-content/images/logos/pi.png" alt="Privacy International"></a>
<<<<<<< HEAD
<a href="http://xnet-x.net/" target="_blank" title="X Net"><img src="/wp-content/images/logos/xnet.png" alt="X Net"></a>
=======
<a href="http://www.xnet.com/" target="_blank" title="X Net"><img src="/wp-content/images/logos/xnet.png" alt="X Net"></a>
>>>>>>> master
</div>
</div>
<!-- .site-info -->
......
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