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

Jump to bottom

わかばのプロフィールを追加 #166

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

わかばのプロフィールを追加 #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8268302
わかばのプロフィールを追加
soukitidayo Oct 6, 2023
f8ff964
オープンゼミの開催を5月5日に更新
soukitidayo Oct 10, 2023
821e90f
オープンゼミの開催を5月6日に更新
soukitidayo Oct 10, 2023
8d1ffbe
Merge branch 'update-news'
soukitidayo Oct 11, 2023
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
6 changes: 5 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ <h1><a href="index.html">真央ゼミナール</a></h1>
<div class="col harf">
<h2>NEWS</h2>
<p>どなたでも参加可能！オープンゼミ 〜Gitを使ってみよう〜</p>
<p>開催日未定</p>
<<<<<<< HEAD
<p>5月6日開催</p>
=======
<p>5月5日開催</p>
>>>>>>> update-news
</div>
</div>
<div class="row">
Expand Down
1 change: 1 addition & 0 deletions member.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ <h2>Assistant</h2>
<div class="col harf">
<h2>Research Student</h2>
<img src="images/icon_wakaba.jpg" alt="わかば">
<p>新入生。Webデザイナーになるのが夢。
</div>
</div>

Expand Down