Skip to content

Commit

Permalink
Merge branch '5chackathon:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
seohyeonlee2020 authored Oct 7, 2023
2 parents 772d9b2 + b31ab38 commit 37f17a4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
echo "CI/CD: starting deploy"
cd ~/5chackathon.github.io
echo "CI/CD: checkout branch"
sudo git checkout main
git checkout main
echo "CI/CD: pulling latest file"
sudo git pull https://github.com/5chackathon/5chackathon.github.io.git
echo "CI/CD: finished"
git pull https://github.com/5chackathon/5chackathon.github.io.git
echo "CI/CD: finished"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# 5CHack.com
A website host for the 5C Hackathon occuring April 14-15, 2023!
A website host for the 5C Hackathon occuring April 14-15, 2023! See our site live at [5CHack.com](https://www.5chack.com/).
14 changes: 7 additions & 7 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,9 @@ <h4 style="text-align: center; margin-bottom: 1em;">April 14&ndash;15, 2023</h4>
<td><a class = "bright-link" href="#hack-week">schedule below!</a></td>
</tr>
<tr>
<td class="session__time">April 14, 6:00 PM</td>
<td>Registration</td>
<td>Estella Courtyard</td>
<td class="session__time">April 14, 6:15 PM</td>
<td>Check-in</td>
<td>Estella Laboratory Courtyard</td>
</tr>
<tr>
<td class="session__time">April 14, 6:30 PM</td>
Expand Down Expand Up @@ -346,7 +346,7 @@ <h4 style="text-align: center; margin-bottom: 1em;">April 14&ndash;15, 2023</h4>
<td>Edmunds Ballroom</td>
</tr>
<tr>
<td class="session__time">April 15, 7:30 AM</td>
<td class="session__time">April 15, 8:00 AM</td>
<td>Breakfast by Bloomberg</td>
<td>Edmunds Ballroom</td>
</tr>
Expand All @@ -357,7 +357,7 @@ <h4 style="text-align: center; margin-bottom: 1em;">April 14&ndash;15, 2023</h4>
<tr>
<td class="session__time">April 15, 12:00 PM</td>
<td>Mario Kart Tournament</td>
<td>Edmunds 221</td>
<td>TBA</td>
</tr>
<tr>
<td class="session__time">April 15, 3:00 PM</td>
Expand Down Expand Up @@ -519,7 +519,7 @@ <h6 class="card-text text-muted"><a href="https://www.linkedin.com/in/nathaniel-
<h5 class="card-title text-center">Thursday, April 13</h5>
<h5 class="dark-blue"">Web Dev for Makers</h5>
<h6 class="card-text text-muted"><a href="https://www.linkedin.com/in/samsonzhangthesalmon/">Samson Zhang PO '25</a>, Project Member at <a href="https://www.p-ai.org">P-ai</a>, Creator of <a href="webdevformakers">Web Dev For Makers</a></h6>
<p class="card-text">Location: Estella Argue Auditorium, Pomona</p>
<p class="card-text">Location: Estella Argue Auditorium, Pomona, & Zoom (register to get Meeting ID)</p>
<p class="card-text">Time: 6:30 PM</p>
<!-- <p class="card-text">Description:</p> -->
</div>
Expand Down Expand Up @@ -755,7 +755,7 @@ <h4 class="dark-blue">MEET THE TEAM</h4>
<h6 class="dark-blue">Director</h6>
<p>Hannah Mandell</p>
<h6 class="dark-blue">Logistics</h6>
<p>Catherine Byen, Richard Kim, Liv Christy</p>
<p>Catherine Byen</p>
<h6 class="dark-blue">Hack Week</h6>
<p>Emily Tomz</p>
<h6 class="dark-blue">Sponsorships</h6>
Expand Down

0 comments on commit 37f17a4

Please sign in to comment.