commit

f9d9e309 · marvin · 12156ee1 · b38041d4 · f9d9e309 · f9d9e309
Commit f9d9e309 authored Jul 15, 2020 by marvin
--- a/source/site/cafe/index.html
+++ b/source/site/cafe/index.html
--- a/source/site/howto/index.html
+++ b/source/site/howto/index.html
--- a/source/site/index.html
+++ b/source/site/index.html
--- a/source/site/pic/Bingdao-daye-shu-pu-erh-1.jpg
+++ b/source/site/pic/Bingdao-daye-shu-pu-erh-1.jpg
--- a/source/site/pic/Bingdao-daye-shu-pu-erh-2.jpg
+++ b/source/site/pic/Bingdao-daye-shu-pu-erh-2.jpg
--- a/source/site/pic/Bingdao-daye-shu-pu-erh-3.jpg
+++ b/source/site/pic/Bingdao-daye-shu-pu-erh-3.jpg
--- a/source/site/pic/Bingdao-daye-shu-pu-erh-4.jpg
+++ b/source/site/pic/Bingdao-daye-shu-pu-erh-4.jpg
--- a/source/site/pic/biela-orchidea-1.jpg
+++ b/source/site/pic/biela-orchidea-1.jpg
--- a/source/site/pic/biela-orchidea-2.jpg
+++ b/source/site/pic/biela-orchidea-2.jpg
--- a/source/site/pic/biela-orchidea-3.jpg
+++ b/source/site/pic/biela-orchidea-3.jpg
--- a/source/site/pic/biela-orchidea-4.jpg
+++ b/source/site/pic/biela-orchidea-4.jpg
--- a/source/site/search/search_index.json
+++ b/source/site/search/search_index.json
--- a/source/site/sitemap.xml
+++ b/source/site/sitemap.xml
 <?xml version="1.0" encoding="UTF-8"?>
+<<<<<<< HEAD
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"><url>
     <loc>None</loc>
     <lastmod>2020-07-15</lastmod>
@@ -10,6 +11,22 @@
    </url><url>
     <loc>None</loc>
     <lastmod>2020-07-15</lastmod>
+=======
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+    <url>
+     <loc>/</loc>
+     <lastmod>2020-07-12</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>/cafe/</loc>
+     <lastmod>2020-07-12</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>/howto/</loc>
+     <lastmod>2020-07-12</lastmod>
+>>>>>>> b38041d41f3aad7e7742d9564dd355dbd9dd8558
     <changefreq>daily</changefreq>
    </url>
 </urlset>
\ No newline at end of file