Gah ignore that commit :)

Sent from Samsung Mobile


Amir Chaudhry <notifications@github.com> wrote:



In tmpl/wiki/overview-of-mirage.md:

> @@ -69,19 +54,20 @@ devices. There is also
>  Mirage appliances are being used to present slides for conferences.  These
>  are both cases of how Mirage is being used right now and below are examples
>  of things we can do in the future.
> +>>>>>>> 249106754b7a82400e6b5c6a4d80a06d0c0ada3b


This too. Am guessing unresolved merge conflict?

—
Reply to this email directly or view it on GitHub<https://github.com/mirage/mirage-www/pull/52/files#r8201690>.