fixing merge conflicts

ryanb · Oct 19, 2008 · 9a5fb0d · 9a5fb0d
2 parents 57b409c + 9e3d3a3
commit 9a5fb0d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
@@ -18,8 +18,8 @@
   	   </div>
   	</div>
   	<% end %>
-  <% end %>
-	<%= will_paginate @projects %>
+  	<%= will_paginate @projects %>
+	<% end %>
 </div>
 
 <div id="sidebar">

diff --git a/app/views/welcome/about.html.erb b/app/views/welcome/about.html.erb
@@ -5,7 +5,7 @@
 	<%= image_tag "about.png", :align => "left" %>
 	<strong>MyIdeaDrawer</strong> lets you organize everything you need for your next project, all in one place. Whether you're building a web site, redesigning a room, or putting togther a school report. Organize code, links, notes, palettes, photos, and screen shots all in one convenient location.
 	<br /><br />
-	<strong>MyIdeaDrawer</strong> was built in just under 48 hours, during the 2-day <a href="http://railsrumble.com">Rails Rumble 2008</a> competition by Ryan Bates and Kelli Shaver. We'd like to thank many staff, sponsors, volunteers, and participants who made this competition possible and we invite each and every one of you to look around and explore oru application. Remeber, if you like <strong>MyIdeaDrawer</strong>, please don't forget to <a href="http://myideadrawer.vote.railsrumble.com">Vote For Us</a>!</p>
+	<strong>MyIdeaDrawer</strong> was built in just under 48 hours, during the 2-day <a href="http://railsrumble.com">Rails Rumble 2008</a> competition by Ryan Bates and Kelli Shaver. We'd like to thank the many staff, sponsors, volunteers, and participants who made this competition possible and we invite each and every one of you to look around and explore our application. Remeber, if you like <strong>MyIdeaDrawer</strong>, please don't forget to <a href="http://myideadrawer.vote.railsrumble.com">Vote For Us</a>!</p>
 
 	<p class="big_desc"><strong>About Kelli Shaver:</strong> <a href="http://kellishaver.com">Kelli</a> has been designing and developing web sites professionally for eight years. Although also a competent back-end programmer, Kelli chooses to specialize in front-end/user-interface design, HTML, CSS, javaScript, and icon design.</p>
 

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
@@ -29,7 +29,7 @@
 	</div>
 	<div class="rumble">
 		<p><strong>MyIdeaDrawer</strong> is a <a href="http://railsrumble.com">Rails Rumble 2008</a> project!<br /><br />
-		If you're visiting <strong>MyIdeaDrawer</strong> for the first time, chances are, you're here as part of <a href="http://railsrumble.com">Rails Rumble 2008</a>. We'd like to thank many staff, sponsors, volunteers, and participants who made this competition possible and we invite each and every one of you to look around and explore oru application.<br /><br />
+		If you're visiting <strong>MyIdeaDrawer</strong> for the first time, chances are, you're here as part of <a href="http://railsrumble.com">Rails Rumble 2008</a>. We'd like to thank the many staff, sponsors, volunteers, and participants who made this competition possible and we invite each and every one of you to look around and explore our application.<br /><br />
 		If you like this project, please don't forget to <a href="http://myideadrawer.vote.railsrumble.com">Vote For Us</a>!
 		</p>
 	</div>