Resolve merge conflict
This commit is contained in:
commit
188c167625
5 files changed
+1823
-18248
No files matched your search
@@ -41,9 +41,8 @@ posts = posts.sort(
|
||||
subscribe with RSS!
|
||||
</a>
|
||||
</p>
|
||||
|
||||
<Footer />
|
||||
</main>
|
||||
<Footer />
|
||||
<ColorScript />
|
||||
</body>
|
||||
</html>
|
||||
Reference in new issue
Block a user