Fixed merge issues

boards/migrations/0043_merge.py

@@ -0,0 +1,16 b''
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-04-29 15:52
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0041_merge'),
+        ('boards', '0042_auto_20160422_1053'),
+    ]
+
+    operations = [
+    ]

boards/admin.py

@@ -1,7 +1,7 b''
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse
-from boards.models import Post, Tag, Ban, Thread, Banner, PostImage
+from boards.models import Post, Tag, Ban, Thread, Banner, PostImage, KeyPair
 
 
 @admin.register(Post)

boards/models/post/__init__.py

@@ -9,6 +9,8 b' from django.db.models import TextField, '
 from django.template.defaultfilters import truncatewords, striptags
 from django.template.loader import render_to_string
 from django.utils import timezone
+from django.dispatch import receiver
+from django.db.models.signals import pre_save, post_save
 
 from boards import settings
 from boards.abstracts.tripcode import Tripcode

boards/urls.py

@@ -1,6 +1,8 b''
 from django.conf.urls import url
 #from django.views.i18n import javascript_catalog
 
+import neboard
+
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
 from boards.views import api, tag_threads, all_threads, \