trying to merge Nolan #111 and Camille's #121

But please check it ... I might have messed it up - I got lost at some stage...
ok - let me know if you see other bugs, there was a few moments when I
wasn't entirely sure which one should be kept. Also, I should have created
a specific branch on my repo rather than using master on my repo - hope
this doesn't confuse things.
cheers
JB


On Mon, Aug 4, 2014 at 7:03 AM, Satrajit Ghosh <notifications@github.com>
wrote:

> In doc/content/specs/nidm-results.html:
>
> > @@ -63,8 +63,16 @@
> >
> >  							var currentDate = new Date()
> >  							var date = currentDate.toString('dddd, MMMM ,yyyy')
> > +<<<<<<< HEAD
>
> @jbpoline <https://github.com/jbpoline> - looks like some merge markers
> are still in the files.
>
> —
> Reply to this email directly or view it on GitHub
> <https://github.com/incf-nidash/nidm/pull/138/files#r15756292>.
>