From 0891090c40516131a0820b90edccd7fa14e0198e Mon Sep 17 00:00:00 2001
From: Charlotte Fereday <cbrfereday@gmail.com>
Date: Sun, 27 Nov 2016 10:43:09 +0000
Subject: [PATCH 1/2] tries to resolve merge conflicts in the page

---
 _layouts/open_source_accelerator.html | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/_layouts/open_source_accelerator.html b/_layouts/open_source_accelerator.html
index 5abf82e..5d21450 100644
--- a/_layouts/open_source_accelerator.html
+++ b/_layouts/open_source_accelerator.html
@@ -1,33 +1,28 @@
 {% include head.html %}
 
 <div class="container">
-<<<<<<< HEAD
-  {% include header.html %}
-=======
     {% include header.html %}
->>>>>>> master
 
   <h1>Hack Brexit Open Source Accelerator</h1>
 
   <ul>
     <li><p><b>Join the Hack Brexit fortnightly Wednesday meetup group <a href="https://www.meetup.com/Hack-Brexit/" target="_blank"> here</a></p></b></li>
 
-<<<<<<< HEAD
     <li><p><b>Join the Hack Brexit slack group for discussion outside of these in person meetups <a href="https://hackbrexit.herokuapp.com/" target="_blank"> here</a></p></b></li>
-=======
+
     <li><p><b>Join the Hack Brexit slack group <a href="https://hackbrexit.herokuapp.com/" target="_blank"> here</a></p></b></li>
->>>>>>> master
+
   </ul>
 
   <h2>What is the accelerator all about?</h2>
 
   <ul>
 
-<<<<<<< HEAD
+
     <li>The accelerator is a three month programme that takes 2 of the 10 projects created during Hack Brexit weekend.</li>
-=======
+
     <li>A three month programme that takes 2 of the 10 projects created during Hack Brexit weekend.</li>
->>>>>>> master
+
 
     <li>Run regular monthly meetings for the teams to present and discuss their projects progress, hosted by ThoughtWorks London.</li>
 

From 981039826122f701b668d931bc21920f3f76ab19 Mon Sep 17 00:00:00 2001
From: Charlotte Fereday <cbrfereday@gmail.com>
Date: Sun, 8 Jan 2017 13:39:59 +0000
Subject: [PATCH 2/2] Amended error in closing tags

---
 _layouts/open_source_accelerator.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/_layouts/open_source_accelerator.html b/_layouts/open_source_accelerator.html
index 21e415c..d6c602e 100644
--- a/_layouts/open_source_accelerator.html
+++ b/_layouts/open_source_accelerator.html
@@ -1,14 +1,14 @@
 {% include head.html %}
 
 <div class="container">
-    {% include header.html %}
+  {% include header.html %}
 
   <h1>Hack Brexit Open Source Accelerator</h1>
 
   <ul>
-    <li><p><b>Join the Hack Brexit fortnightly Wednesday meetup group <a href="https://www.meetup.com/Hack-Brexit/" target="_blank"> here</a></p></b></li>
+    <li><p><b>Join the Hack Brexit fortnightly Wednesday meetup group <a href="https://www.meetup.com/Hack-Brexit/" target="_blank"> here</a></b></p></li>
 
-    <li><p><b>Join the Hack Brexit slack group for discussion outside of these in person meetups <a href="https://hackbrexit.herokuapp.com/" target="_blank"> here</a></p></b></li>
+    <li><p><b>Join the Hack Brexit slack group for discussion outside of these in person meetups <a href="https://hackbrexit.herokuapp.com/" target="_blank"> here</a></b></p></li>
 
   </ul>
 
@@ -60,9 +60,9 @@ <h2>Meetup agenda</h2>
   We've taken forward two of the projects from July's hackathon to participate in our open-source accelerator programme:</p>
 
   <ul>
-    <li><p><b>What the fact <a href="https://github.com/HackBrexit/WhatTheFact/wiki/Accelerator---1st-Meetup----MVP-discussion" target="_blank"> read the wiki here</a></p></b></li>
+    <li><p><b>What the fact <a href="https://github.com/HackBrexit/WhatTheFact/wiki/Accelerator---1st-Meetup----MVP-discussion" target="_blank"> read the wiki here</a></b></p></li>
 
-    <li><p><b>Ministers under the influence <a href="https://github.com/HackBrexit/MinistersUnderTheInfluence/wiki/Accelerator-1st-Meetup-MVP-discussion" target="_blank"> read the wiki here</a></p></b></li>
+    <li><p><b>Ministers under the influence <a href="https://github.com/HackBrexit/MinistersUnderTheInfluence/wiki/Accelerator-1st-Meetup-MVP-discussion" target="_blank"> read the wiki here</a></b></p></li>
   </ul>
 
   <p>We look forward to seeing you there!