gistfile1.diff

			<div id="postbody">
				<div style="float:left;padding-right:5px;">
					<a href="{% url profiles.views.profile post.sender.username %}"><b>{{ post.sender }}</b></a>:
				</div>
				<div style="vertical-align:text-top;">
					{{ post.text|oembed|urlize|fmt_post|safe }}
				</div>
				{% if post.image %}
				<img src="{% thumbnail post.image 400x400 %}"/><br>
				{% endif %}
<<<<<<< HEAD:coathangr/templates/single_post.html
				<div id="postfoot">
					<br><div id="tags">{% show_tags_for post %}</div>
					<br><a href="{{ post.get_absolute_url }}">{{ post.sent|timesince }} ago</a>
					{% if post.replies|length %}
						&nbsp; | &nbsp; <a href="{{ post.get_absolute_url }}#replies">{{ post.replies|length }} repl{{ post.replies|length|pluralize:"y,ies" }}</a>
					{% endif %}
					{% if post.parent %}
				 		&nbsp; | &nbsp; <a href="{{ post.parent.get_absolute_url }}">In reply to {{ post.parent.sender.username }}</a>
					{% endif %}
					<div style="float:right; position: absolute; right: 5px; top: 20px;">
=======
				<div id="tags">{% show_tags_for post.master %}</div>
					<div style="height:10px">
					<div id="postfoot">
						<br><a href="{{ post.get_absolute_url }}">{{ post.sent|timesince }} ago</a>
						{% if post.replies|length %}
							&nbsp; | &nbsp <a href="{{ post.get_absolute_url }}#replies">{{ post.replies|length }} repl{{ post.replies|length|pluralize:"y,ies" }}</a>.
						{% endif %}
						{% if post.parent %}
					 		&nbsp; | &nbsp; <a href="{{ post.parent.get_absolute_url }}">In reply to {{ post.parent.sender.username }}</a>
						{% endif %}
					</div>
					</div>
				<div id="postbuttons">
>>>>>>> dev:coathangr/templates/single_post.html
					{% ifequal post.sender request.user %}
					  <form method="POST" action="{% url timeline_delete_post post.master_id %}">
						<input type="image" alt="Delete" src="{{ MEDIA_URL }}delete.png"/>
					  </form>
					{% endifequal %}