# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1448601495 21600
# Node ID 842c1343061c224d3652a4f12ae1aede705620a6
# Parent  9fc12bbc8c8117f357e5c8257d6bebb02911263f# Parent  51fce245dd47cf8c189ac6c5920dedc57ceaf218
Merge.

diff -r 51fce245dd47 -r 842c1343061c news/admin.py
--- a/news/admin.py	Thu Nov 26 11:13:48 2015 -0600
+++ b/news/admin.py	Thu Nov 26 23:18:15 2015 -0600
@@ -79,7 +79,8 @@
                 meta_description=pending_story.meta_description,
                 short_markup=pending_story.short_markup,
                 long_markup=pending_story.long_markup,
-                admin_content=pending_story.admin_content)
+                admin_content=pending_story.admin_content,
+                version=pending_story.version)
         story.save()
         pending_story.delete()
 
diff -r 51fce245dd47 -r 842c1343061c news/models.py
--- a/news/models.py	Thu Nov 26 11:13:48 2015 -0600
+++ b/news/models.py	Thu Nov 26 23:18:15 2015 -0600
@@ -53,7 +53,7 @@
     update_date = models.DateTimeField(db_index=True, blank=True)
     priority = models.IntegerField(db_index=True, default=0, blank=True)
     meta_description = models.TextField(blank=True)
-    short_markup = models.TextField(default='')
+    short_markup = models.TextField(default='', blank=True)
     long_markup = models.TextField(default='', blank=True)
     admin_content = models.TextField(default='', blank=True)
     version = models.SmallIntegerField(default=NEWS_VERSION)