Resolve merge conflicts

plank · Mar 10, 2016 · 337cb71 · 337cb71
2 parents f55efef + eac03a5
commit 337cb71
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 3 deletions.
diff --git a/boston/index.html b/boston/index.html
@@ -27,7 +27,13 @@ <h2>Schedule</h2>
       <h2>Sponsors</h2>
     </header>
     <ul class='sponsor-list'>
-
+      <li>
+        <a class='espn' href='http://actbluetech.com'>
+          <img alt='ESPN Technology logo' src='/images/boston-sponsors/espn.png'>
+          <h3>ESPN Technology</h3>
+          <small>Hall of Fame Sponsor</small>
+        </a>
+      </li>
       <li>
         <a class='actbluetech' href='http://actbluetech.com'>
           <img alt='ActBlue Technical Services Logo' src='/images/boston-sponsors/actbluetech.png'>
@@ -63,6 +69,13 @@ <h3>MLB Advanced Media</h3>
           <small>Prizes</small>
         </a>
       </li>
+      <li>
+        <a class='baseball-prospectus' href='http://www.baseballprospectus.com'>
+          <img alt='baseball-prospectus Logo' src='/images/chicago-sponsors/baseball-prospectus.png'>
+          <h3>Baseball Prospectus</h3>
+          <small>Prizes</small>
+        </a>
+      </li>
       <li>
         <a class='sportradar' href='http://www.sportradar.com/'>
           <img alt='sportradar logo' src='/images/boston-sponsors/sportradar.png'>
@@ -117,7 +130,13 @@ <h3>
           2016 season (6-month) Real Time MLB key
         </p>
       </li>
-
+      <li>
+        <h3>Boston Runner-Ups</h3>
+        <p>
+          The runner-up team of the Boston competition will win
+          <a href=' http://www.baseballprospectus.com/subscriptions/'>an annual Baseball Prospectus Super Premium subscription</a> for each team member (maximum team size of four).
+        </p>
+      </li>v      
       <li>
         <p>
           and more!

diff --git a/chicago/index.html b/chicago/index.html
@@ -98,7 +98,7 @@ <h3>Chicago Overall Winners</h3>
         <h3>Chicago Runner-Ups</h3>
         <p>
           The runner-up team of the Chicago competition will win
-          <a href='http://www.baseballprospectus.com'>an annual Baseball Prospectus Premium subscription</a> for each team member (maximum team size of four).
+          <a href=' http://www.baseballprospectus.com/subscriptions/'>an annual Baseball Prospectus Super Premium subscription</a> for each team member (maximum team size of four).
         </p>
       </li>
       <li>

diff --git a/images/boston-sponsors/espn.png b/images/boston-sponsors/espn.png
diff --git a/montreal/index-fr.html b/montreal/index-fr.html
@@ -51,6 +51,13 @@ <h3>SportRadar</h3>
           <small>API</small>
         </a>
       </li>
+      <li>
+        <a class='baseball-prospectus' href='http://www.baseballprospectus.com'>
+          <img alt='baseball-prospectus Logo' src='/images/chicago-sponsors/baseball-prospectus.png'>
+          <h3>Baseball Prospectus</h3>
+          <small>Prix</small>
+        </a>
+      </li>
       <a class='action-primary' href='https://docs.google.com/document/d/1N1UtvOCPPPdMF-Y7zvwGZOL5cObL9a2Z0ouOUB5JCTA/edit?usp=sharing'>
         Devenez commanditaires
       </a>

diff --git a/montreal/index.html b/montreal/index.html
@@ -51,6 +51,13 @@ <h3>SportRadar</h3>
           <small>API</small>
         </a>
       </li>
+      <li>
+        <a class='baseball-prospectus' href='http://www.baseballprospectus.com'>
+          <img alt='baseball-prospectus Logo' src='/images/chicago-sponsors/baseball-prospectus.png'>
+          <h3>Baseball Prospectus</h3>
+          <small>Prizes</small>
+        </a>
+      </li>
       <a class='action-primary' href='https://docs.google.com/document/d/1N1UtvOCPPPdMF-Y7zvwGZOL5cObL9a2Z0ouOUB5JCTA/edit?usp=sharing'>
         Be a Sponsor
       </a>

diff --git a/philly/index.html b/philly/index.html
@@ -87,6 +87,13 @@ <h3>Forge Conference</h3>
           <h3>MLB Advanced Media</h3>
         </a>
       </li>
+      <li>
+        <a class='baseball-prospectus' href='http://www.baseballprospectus.com'>
+          <img alt='baseball-prospectus Logo' src='/images/chicago-sponsors/baseball-prospectus.png'>
+          <h3>Baseball Prospectus</h3>
+          <small>Prizes</small>
+        </a>
+      </li>
       <li>
         <a class='sportradar' href='http://www.sportradar.com/'>
           <img alt='sportradar logo' src='/images/boston-sponsors/sportradar.png'>
@@ -116,6 +123,13 @@ <h3>Baseball Hack Day Grand Prize Winner</h3>
           In addition, the team who takes the grand prize (best of the winning teams of participating cities) will also recieve additional prize (and major bragging rights!)
         </p>
       </li>
+      <li>
+        <h3>Philadelphia Runner-Ups</h3>
+        <p>
+          The runner-up team of the Philadelphia competition will win
+          <a href=' http://www.baseballprospectus.com/subscriptions/'>an annual Baseball Prospectus Super Premium subscription</a> for each team member (maximum team size of four).
+        </p>
+      </li>
       <li>and more...</li>
       <!--<li>
         <h3>Overall Winner</h3>

diff --git a/sf/index.html b/sf/index.html
@@ -47,6 +47,13 @@ <h3>SportRadar</h3>
           <small>API</small>
         </a>
       </li>
+      <li>
+        <a class='baseball-prospectus' href='http://www.baseballprospectus.com'>
+          <img alt='baseball-prospectus Logo' src='/images/chicago-sponsors/baseball-prospectus.png'>
+          <h3>Baseball Prospectus</h3>
+          <small>Prizes</small>
+        </a>
+      </li>
       <li>
           <h3>.. and more!</h3>
       </li>
@@ -72,6 +79,13 @@ <h3>Baseball Hack Day Grand Prize Winner</h3>
           In addition, the team who takes the grand prize (best of the winning teams of participating cities) will also recieve additional prize (and major bragging rights!)
         </p>
       </li>
+      <li>
+        <h3>San Francisco Runner-Ups</h3>
+        <p>
+          The runner-up team of the San Francisco competition will win
+          <a href=' http://www.baseballprospectus.com/subscriptions/'>an annual Baseball Prospectus Super Premium subscription</a> for each team member (maximum team size of four).
+        </p>
+      </li>
       <li>... and more!</li>
     </ul>
   </section>