From b31e8db993851bded37cf1970982094c87e9a8f7 Mon Sep 17 00:00:00 2001
From: Matt Mullenweg <matt@git.wordpress.org>
Date: Wed, 21 May 2003 11:36:40 +0000
Subject: [PATCH] Conflict resolution.

git-svn-id: https://develop.svn.wordpress.org/trunk@28 602fd350-edb4-49c9-b593-d223f7449a82
---
 index.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/index.php b/index.php
index 69efe2108f..50760385ca 100644
--- a/index.php
+++ b/index.php
@@ -34,12 +34,8 @@
 <h3 class="storytitle"><a href="<?php permalink_link() ?>"><?php the_title(); ?></a> <a href="?cat=<?php the_category_ID() ?>" title="Category: <?php the_category() ?>" class="storycategory">[<?php the_category() ?>]</a> - <span class="storyauthor"><?php the_author() ?></span> @ <?php the_time() ?>
 </h3>
 
-<<<<<<< index.php
 <div class="storycontent">
 
-=======
-<div class="storyContent">
->>>>>>> 1.8
 <?php the_content(); ?>
 
 <div class="feedback">