21 lines
574 B
Plaintext
21 lines
574 B
Plaintext
<#include "header.ftl">
|
|
<<<<<<< HEAD
|
|
<@head title="${blog_title!}" />
|
|
<#include "module/module_pageNav.ftl">
|
|
<main>
|
|
<div class="wrap min">
|
|
<#include "module/module_post.ftl">
|
|
<@pageNav method="index" />
|
|
</div>
|
|
<main>
|
|
=======
|
|
<@head title="${blog_title!}" />
|
|
<#include "module/module_pageNav.ftl">
|
|
<main>
|
|
<div class="wrap min">
|
|
<#include "module/module_post.ftl">
|
|
<@pageNav method="index" />
|
|
</div>
|
|
<main>
|
|
>>>>>>> 4fe9ac8 (瞎改的一天)
|
|
<#include "footer.ftl"> |