<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body wsmode="reply" bgcolor="#FFFFFF" text="#000000">
<div class="moz-cite-prefix">Hi Alex,<br>
<br>
they have become divergent. I will get Tom (who knows Git better
than I) to sort this out :)<br>
<br>
Kind regards<br>
<br>
Mark<br>
<br>
<br>
On 30/11/2015 12:15, Alex Muntada wrote:<br>
</div>
<blockquote cite="mid:20151130121551.GB28410@xps" type="cite">
<pre wrap="">Alex Muntada:
</pre>
<blockquote type="cite">
<pre wrap="">I prepared a pull request with the new jquery file and script:
<a class="moz-txt-link-freetext" href="https://github.com/Act-Conferences/lpw2015/pull/4">https://github.com/Act-Conferences/lpw2015/pull/4</a>
</pre>
</blockquote>
<pre wrap="">
By the way, I see that production and master branches on lpw2015
have diverged. There are a few commits in master that are not
present in production and the other way around too.
I'm sorry, I thought that master was the development branch so
I created the pull request on master. You should probably rebase
master on production.
Cheers,
Alex
_______________________________________________
Act mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Act@mongueurs.net">Act@mongueurs.net</a>
<a class="moz-txt-link-freetext" href="http://listes.mongueurs.net/mailman/listinfo/act">http://listes.mongueurs.net/mailman/listinfo/act</a>
</pre>
</blockquote>
<br>
<br></br><br>
<div id="WISESTAMP_SIG_5859">
<div style="font-size: 13px; font-family: Verdana, Arial,
Helvetica, sans-serif;">
<div style="border: 1px solid #e5e5e5;background-color:
#f8f8f8;padding: 0.8em 0.8em 0.3em 0.8em;">
<div style="margin: 0 0 8px 0">
<table border="0">
<tbody>
<tr valign="top">
<td class="border-right" style="padding-right: 8px;"><img
moz-do-not-send="true"
src="https://s3.amazonaws.com/uploads.wisestamp.com/b64b6ed1ea94709008b7b071d154f608/1429695767.png"
alt="" height="116" width="98"></td>
<td style="color: #646464; padding-left: 6px;">
<div style="text-transform: capitalize;"><strong
class="text-color theme-font">mark Keating</strong><br>
<span style="font: 10pt Arial;">Managing Director</span></div>
<div style="font: 10pt Arial; color: #8d8d8d;
font-size: 8pt; padding: 5px 0;"><span>t:</span>
+44 (0)1524 842155 <span> | <span
class="text-color">m:</span> +44 (0) 7951
557226</span><span> |</span><span>
<br>
<span class="text-color">w:</span>
<a class="moz-txt-link-abbreviated" href="http://www.shadow.cat">www.shadow.cat</a> <br>
<span><span class="text-color">w:</span>
<a class="moz-txt-link-abbreviated" href="http://www.shadownms.com">www.shadownms.com</a><br>
</span> <br>
<br>
</span></div>
</td>
</tr>
</tbody>
</table>
</div>
<a href="https://www.facebook.com/ShadowcatSystems"
style="text-decoration: underline"><img
moz-do-not-send="true" alt="Facebook" style="padding: 0px
0px 5px 0px; vertical-align: middle;"
src="https://s3.amazonaws.com/images.wisestamp.com/facebook.png"
height="16" border="0" width="16"></a> <a
href="https://twitter.com/shadow_dot_cat"
style="text-decoration: underline"><img
moz-do-not-send="true" alt="Twitter" style="padding: 0px
0px 5px 0px; vertical-align: middle;"
src="https://s3.amazonaws.com/images.wisestamp.com/twitter.png"
height="16" border="0" width="16"></a> <a
href="https://uk.linkedin.com/in/markkeating"
style="text-decoration: underline"><img
moz-do-not-send="true" alt="LinkedIn" style="padding: 0px
0px 5px 0px; vertical-align: middle;"
src="https://s3.amazonaws.com/images.wisestamp.com/linkedin.png"
height="16" border="0" width="16"></a> <a
href="https://www.flickr.com/photos/shadowcat_mdk/"
style="text-decoration: underline"><img
moz-do-not-send="true" alt="Flickr" style="padding: 0px
0px 5px 0px; vertical-align: middle;"
src="https://s3.amazonaws.com/images.wisestamp.com/flickr.png"
height="16" border="0" width="16"></a> <a
href="https://instagram.com/shadow_dot_cat/"
style="text-decoration: underline"><img
moz-do-not-send="true" alt="Instagram" style="padding: 0px
0px 5px 0px; vertical-align: middle;"
src="https://s3.amazonaws.com/images.wisestamp.com/instagram.png"
height="16" border="0" width="16"></a><br>
<span style="color: gray;">Contact me: </span> <img
moz-do-not-send="true" alt="Google Talk" style="padding: 0px
0px 5px 0px; vertical-align: middle;"
src="https://s3.amazonaws.com/images.wisestamp.com/gtalk.png"
height="16" border="0" width="16"> mark.keating <img
moz-do-not-send="true" alt="Skype" style="padding: 0px 0px
5px 0px; vertical-align: middle;"
src="https://s3.amazonaws.com/images.wisestamp.com/skype.png"
height="16" border="0" width="16"> shadowcat-mdk<br>
<div style="max-width: 469px; padding: 0.5em 0 0.5em;"><span
style="font-size: 90%;"><span style="color: gray">Latest
Blog:</span> <a
href="http://shadow.cat/blog/mark-keating/2015/32-car-user-story/"><span
style="color:#00e; text-decoration: underline;">User
Story</span></a></span><br>
</div>
<div style="max-width: 469px; padding: 0.5em 0 0.5em;"> <a
href="http://www.twitter.com/shadowcat_mdk"
target="_blank"> <img moz-do-not-send="true"
src="http://twitter-badges.s3.amazonaws.com/follow_me-c.png"
style="border: none;" alt="Follow teststamp on Twitter">
</a></div>
<div style="padding: 0.5em 0 0.5em">
<div style="margin-top: 1em; padding-top: 0.5em; color:
gray; border-top: 1px solid gray; font-size: 90%">IMPORTANT:
The contents of this email and any attachments are
confidential. They are intended for the named recipient(s)
only. If you have received this email by mistake, please
notify the sender immediately and do not disclose the
contents to anyone or make copies thereof.</div>
</div>
</div>
<div style="margin-top: 3px;padding-top: 2px; font-size: 75%;"><a
style="color: #6F6F6F; text-decoration: none;"
href="http://r1.wisestamp.com/r/landing?u=032dffc11b64b6ed&v=null&t=1448885917406&promo=10&dest=http%3A%2F%2Fwww.wisestamp.com%2Femail-install%3Futm_source%3Dextension%26utm_medium%3Demail%26utm_campaign%3Dpromo_10"><span
style="color: #6F6F6F;">Designed with WiseStamp - </span></a><a
style="color: #3f48cc; text-decoration: underline;"
href="http://r1.wisestamp.com/r/landing?u=032dffc11b64b6ed&v=null&t=1448885917406&promo=10&dest=http%3A%2F%2Fwww.wisestamp.com%2Femail-install%3Futm_source%3Dextension%26utm_medium%3Demail%26utm_campaign%3Dpromo_10"><span
style="color: #3f48cc;">Get yours</span></a> <img
moz-do-not-send="true"
src="http://static.wisestamp.com/promo/promo.html/p.gif?u=032dffc11b64b6ed&v=null&t=1448885917406&promo=10"
height="1" width="1"></div>
</div>
</div>
</body>
</html>