OSDN Git Service

テンプレートのfooter細分化に伴ったコンフリクトの解決。
authorDeskull <desull@users.sourceforge.jp>
Sat, 24 Mar 2018 11:22:35 +0000 (20:22 +0900)
committerDeskull <desull@users.sourceforge.jp>
Sat, 24 Mar 2018 11:22:35 +0000 (20:22 +0900)
Merge branch 'master' of git.osdn.net:/gitroot/hengband/web

# Conflicts:
# src/template.html

1  2 
src/footer.html

diff --cc src/footer.html
index 4406a41,0000000..e8f824b
mode 100644,000000..100644
--- /dev/null
@@@ -1,16 -1,0 +1,15 @@@
-                               Powered by <a href="http://sourceforge.jp/" class="footer_banner">\r
-                               <img src="https://sourceforge.jp/sflogo.php?group_id=541" border="0" alt="SourceForge.jp">\r
 +              <footer>\r
 +\r
 +                      <section>\r
 +                              各ページへのリンクは御自由にどうぞ。/ Link Free.<br>\r
 +                              2018 Hengband Dev Team. <a href="mailto:hengband-dev@lists.sourceforge.jp">hengband-dev@lists.sourceforge.jp</a><br>\r
 +                      </section>\r
 +\r
 +                      <section>\r
\r
++                              Powered by <a href="https://osdn.net/" class="footer_banner">\r
++                              <img src="//osdn.net/sflogo.php?group_id=541" border="0" alt="OSDN">\r
 +                              </a>\r
 +                      </section>\r
 +\r
 +              </footer>\r
 +\r