commit: 034b76311e6ecdc30c728c860bc538197b585f4b
parent fd9616314fd4b1dd5243a6210d514b75fa4caa18
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Tue, 31 Oct 2017 02:48:12 +0100
animelist#Watched: Try to recover some dates or guess them
Diffstat:
1 file changed, 4 insertions(+), 0 deletions(-)
diff --git a/animelist.shtml b/animelist.shtml
@@ -188,7 +188,11 @@
<tr><td>ヱヴァンゲリヲン新劇場版:序</td><td>Evangelion: 1.0 You Are (Not) Alone</td><td><2015</td><td><2015</td></tr>
<tr><td>ヱヴァンゲリヲン新劇場版:破</td><td>Evangelion: 2.0 You Can (Not) Advance</td><td><2015</td><td><2015</td></tr>
<tr><td>中二病でも恋がしたい! 戀</td><td>Love, Chunibyo and Other Delusions! Heart Throb</td><td>2017-04</td><td>2017-04-15</td></tr>
+<<<<<<< HEAD
<tr><td>中二病でも恋がしたい!</td><td>Love, Chunibyo & Other Delusions!</td><td>2014, 2017-11-06</td><td>2014, 2017-11-06</td></tr>
+=======
+ <tr><td>中二病でも恋がしたい!</td><td>Love, Chunibyo & Other Delusions!</td><td>2014</td><td>2014</td></tr>
+>>>>>>> animelist#Watched: Try to recover some dates or guess them
<tr><td>会長はメイド様!</td><td>Maid Sama!</td><td><2015</td><td><2015</td></tr>
<tr><td>俺の妹がこんなに可愛いわけがない.</td><td>Oreimo 2</td><td><=2016</td><td><=2016</td></tr>
<tr><td>俺の妹がこんなに可愛いわけがない</td><td>Oreimo</td><td><=2016</td><td><=2016</td></tr>
