Merge branch 'master' of https://github.com/volosoft/abp

modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/Blogs/IBlogAppService.cs

@@ -15,15 +15,11 @@ namespace Volo.Blogging.Blogs
         Task<BlogDto> GetByShortNameAsync(string shortName);
 
         Task<BlogDto> GetAsync(Guid id);
-
-<<<<<<< HEAD
+        
         Task<BlogDto> Create(CreateBlogDto input);
 
         Task<BlogDto> Update(Guid id, UpdateBlogDto input);
 
         Task Delete(Guid id);
-=======
-        Task<BlogDto> Create(CreateBlogDto blog);
->>>>>>> 5023d9202b64c4367e1234ad5e5f7acb76c592e3
     }
 }

modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml

@@ -31,7 +31,6 @@
                             </small>
                         </h1>
                     </div>
-<<<<<<< HEAD
                     <div class="article-owner">
                         <div class="article-infos">
                             <div class="user-card">
@@ -61,10 +60,6 @@
                             </div>
                         </div>
                     </div>
-                    <div class="user-link-icons">
-                        <a class="add-bookmark" href="#">
-                            <i class="fa fa-bookmark"></i>
-=======
                     <div class="col-sm-4 text-right">
                         <br />
                         <a href="#">
@@ -77,7 +72,6 @@
                         <span class="vs-seperator">|</span>
                         <a href="#">
                             <i class="fa fa-github"></i>
->>>>>>> 5023d9202b64c4367e1234ad5e5f7acb76c592e3
                         </a>
                         <span class="vs-seperator">|</span>
                         <a href="#">