Permalink
Browse files

html fix

  • Loading branch information...
jvehent committed Jan 15, 2012
1 parent ff43926 commit 2896abaa292dce42f25d3edd5be7a4739c15611b
Showing with 0 additions and 4 deletions.
  1. +0 −4 postscreen_stats.py
View
@@ -538,11 +538,7 @@ def action_filter(self,filter):
<h1>Postscreen Map of Blocked IPs</h1>
<div id="map">
</div>
-<<<<<<< HEAD
<p>mapping ''' + str(len(blocked_clients)) + ''' blocked IPs</p>
-=======
- <p>Mapped ''' + str(len(blocked_clients))) + ''' IPs</p>
->>>>>>> e01f281cc299ebac9d7090e6fbeb9cac3820ed8d
<p>generated using <a href="https://github.com/jvehent/Postscreen-Stats">Postscreen-Stats</a> by <a href="http://1nw.eu/!j">Julien Vehent</a></p>
</body>
</html>

0 comments on commit 2896aba

Please sign in to comment.