X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fstatic%2Ft%2Fview_blog%2Fpost.html;fp=webcit%2Fstatic%2Ft%2Fview_blog%2Fpost.html;h=ff1b11b0760184d8e25de09a074f8ba99bc11a9a;hb=7974c7b863e396a87e1479525a10db9b9cf93ca9;hp=0dfee3de41602c9ff56174f4deca7b829c34562a;hpb=d4c971207fb13dd52ac1a7a6e53e531e4fbe03c2;p=citadel.git diff --git a/webcit/static/t/view_blog/post.html b/webcit/static/t/view_blog/post.html index 0dfee3de4..ff1b11b07 100644 --- a/webcit/static/t/view_blog/post.html +++ b/webcit/static/t/view_blog/post.html @@ -36,3 +36,30 @@ +<<<<<<< HEAD +======= +
+ + + ">"" <> + "> + @ + + + + + ');">[] + +
+
+ + + + + + + +
+
+ +>>>>>>> 8fae1a3f7a2c53606f1c7418637f141e424e5b26