WordPress.org
Get WordPress

Make WordPress Core

Changeset 28 for trunk/index.php


Ignore:
Timestamp:
05/21/2003 11:36:40 AM (22 years ago)
Author:
saxmatt
Message:

Conflict resolution.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/index.php

    r26 r28  
    3535</h3>
    3636
    37 <<<<<<< index.php
    3837<div class="storycontent">
    3938
    40 =======
    41 <div class="storyContent">
    42 >>>>>>> 1.8
    4339<?php the_content(); ?>
    4440
Note: See TracChangeset for help on using the changeset viewer.