Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First pull request #26

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

First pull request #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
223f81e
modify: change the name of the hotel
hayato0024 Nov 12, 2016
7b403cd
add: generate access.html
hayato0024 Nov 12, 2016
6ebd961
delete: delete access.html
hayato0024 Nov 12, 2016
983c99a
modify: modify typos
hayato0024 Nov 12, 2016
5ace6a4
modify: change the contents
hayato0024 Nov 12, 2016
5372feb
modify: test partly commit
hayato0024 Nov 12, 2016
eddbad8
modify: delete test commit
hayato0024 Nov 12, 2016
453f00e
add: add gitignore
hytiid Nov 12, 2016
9fd2edf
Merge commit '6fbd3bc6cddbbf7517ceb45180c00f32200d5902'
hytiid Nov 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ignoretest.txt
6 changes: 3 additions & 3 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
Expand Down Expand Up @@ -26,8 +26,7 @@ <h1 class="site-name">ミクロネシアプレミアムリゾートホテル</h1
<div class="content">
<h1 class="heading01">当ホテルからのご案内</h1>
<h2 class="heading02">オンライン宿泊予約特典</h2>
<p>インターネットで予約すると、特別料金でご宿泊いただけます。</p>
<p>インターネットで予約すると、特別料金(20%OFF)でご宿泊いただけます。</p>
<p>インターネットで予約すると、特別料金(20％OFF)でご宿泊いただけます。</p>
<p>ユーザー登録していただくとお得なご案内をお送りいたします。</p>
<p>【ダイレクトメール可否を「許可する」にされた方にのみお送りいたします】</p>
</div>
Expand All @@ -39,6 +38,7 @@ <h2 class="heading02">新着情報</h2>
<li>サンキューデー料金のシングルルーム</li>
<li>ネットキャンペーン実施中</li>
<li>お客様用パソコンをご用意しています</li>
<li>全室wifi完備</li>
<li>マイカープランございます</li>
<li>設備点検は、無事終了いたしました</li>
<li>２泊以上の方にお得な連泊プランご用意しています</li>
Expand Down