Skip to content
Browse files

fixing website

  • Loading branch information...
1 parent d500e66 commit 1f7b0eb2892509bbd63336792ed613d4a1680b52 @jedi4ever committed Apr 10, 2013
Showing with 0 additions and 3 deletions.
  1. +0 −3 site/content/events/2013-paris/_sponsors.txt
View
3 site/content/events/2013-paris/_sponsors.txt
@@ -36,12 +36,9 @@ filter: erb
{ :image => "sfeir.png", :name => "Sfeir", :link => "http://www.sfeir.com/"},
{ :image => "dow.png", :name => "Days of Wonder", :link => "http://www.daysofwonder.com/"},
{ :image => "stanford.png", :name => "Stanford Ignite Paris", :link => "http://www.gsb.stanford.edu/ignite/paris"},
-<<<<<<< HEAD
-=======
{ :image => "mozilla.png", :name => "Mozilla", :link => "http://www.mozilla.org/"},
{ :image => "sqli.png", :name => "Sqli", :link => "http://www.sqli.com/"},
{ :image => "prologism.png", :name => "Prologism", :link => "http://www.prologism.fr"},
->>>>>>> a28361acdf4135ef4dd5d14c1f1b827524a09fea
]%>
<% unless @ssponsors.empty? %><h1>Silver sponsors</h1><% end %>

0 comments on commit 1f7b0eb

Please sign in to comment.
Something went wrong with that request. Please try again.