fix to draft-list

app/views/author/components/draft-list.pug

@@ -43,11 +43,7 @@ mixin renderFullDraftList (posts)
                   div(uk-grid).uk-grid-medium.uk-text-medium
                     .uk-width-expand
                       a(href=`/post/${draft.slug}`, title="Edit draft")= moment(draft.created).fromNow()
-<<<<<<< HEAD
-                      if drafts.all
-=======
                       if posts.all
->>>>>>> 228169f4b66e2cd17892cec984f424ec323ea3e2
                         span  by
                         a(href=`/user/${draft.author.username}`)=` ${draft.author.username}`
               .uk-width-auto
@@ -63,10 +59,6 @@ mixin renderFullDraftList (posts)
                   onclick="return dtp.app.deletePost(event);",
                 ).uk-text-danger
                   +renderButtonIcon('fa-trash', 'delete')
-<<<<<<< HEAD
-    +renderPaginationBar('/author/posts', drafts.totalPostCount)
-=======
     +renderPaginationBar('/author/drafts', posts.totalPostCount)
->>>>>>> 228169f4b66e2cd17892cec984f424ec323ea3e2
   else
     .uk-margin-small You have no drafts.