Correctly merge changes for Quickstart guide

This commit is contained in:
Anthony Wang 2021-09-11 15:06:24 -05:00
parent 77613680b4
commit 27b36e5e42

View file

@ -80,11 +80,7 @@
<h3>Questions?</h3>
<p>
<<<<<<< HEAD
Check out our <a href="/fuqs">frequently unasked questions</a> or ask about it on <a href="https://matrix.to/#/!epVJFHxAwGJBqjgGoQ:exozy.me?via=exozy.me&via=matrix.org">Matrix</a> to get help from the exozyme community!
=======
Check out our <a href="/fuqs">frequently unasked questions</a> and <a href="https://git.exozy.me/exozyme/exozyme/wiki">wiki</a> or ask about it on <a href="https://matrix.to/#/!dRcbHQEbbDRNcYShLo:exozy.me?via=exozy.me&via=matrix.org">Matrix</a> to get help from the exozyme community!
>>>>>>> 197bc29b41e6062ae48c202db739ad63f9d02a19
</p>
<br>
</div>