Skip to content

From Micronesia to Hawaiian #24

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

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

From Micronesia to Hawaiian #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f2ecc7a
ミクロネシアからハワイアンに修正
Dec 10, 2016
eafec5b
（仮）
Dec 10, 2016
7cd81c4
ミクロネシアからハワイアンへ変更
Dec 10, 2016
a7e36e3
commit
Dec 10, 2016
631f892
Revert "commit"
Dec 10, 2016
5d0cef0
Add .gitignore
Dec 10, 2016
7b8ef59
From Hawaiian to Oceania
Dec 10, 2016
605e602
From Oceania to Fiji
Dec 10, 2016
737d082
From Oceania to Hawaiian
Dec 10, 2016
0b5699f
Merge branch 'TaskA'
Dec 10, 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
Empty file added .gitignore
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="css/main.css" media="screen">
<link href="http://maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
<title>ミクロネシアプレミアムリゾートホテル</title>
<title>フィジープレミアムリゾートホテル</title>
<script type="text/javascript" src="js/main.js"></script>
</head>
<body>
<div id="container">
<div id="header">
<h1 class="site-name">ミクロネシアプレミアムリゾートホテル</h1>
<h1 class="site-name">フィジープレミアムリゾートホテル</h1>
<ul id="nav">
<li class="active"><a href="index.html" title="TOPページへ戻る">Home</a></li>
<li><a href="#" title="お部屋の一覧はこちらから"><i class="fa fa-home light">&nbsp;</i>お部屋の種類</a></li>
Expand Down