Skip to content
Open
Changes from all commits
Commits
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: 3 additions & 3 deletions source/ch-instructor-guide/sec-instructor-intro.ptx
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@
<xref ref="topic-synchronizing-exercise-notes" text="custom">Exercise Notes</xref>
]
</p>
</li><url href="https://github.com/HFOSSedu/GitKit-Codespace/raw/refs/heads/main/materials/slides/Ch5-MergeConflicts.pptx">Download Slides</url>
</li>
</ul>
</p>
</li>
Expand All @@ -659,7 +659,7 @@
<ul>
<li>
<p>
[ |
[ <url href="https://github.com/HFOSSedu/GitKit-Codespace/raw/refs/heads/main/materials/slides/Ch5-MergeConflicts.pptx">Download Slides</url> |
<xref ref="topic-merge-conflicts-slide-notes" text="custom">Slide Notes</xref> |
<xref ref="topic-merge-conflicts-todo" text="custom">To-Do</xref> |
<xref ref="topic-merge-conflicts-exercise-notes" text="custom">Exercise Notes</xref>
Expand Down Expand Up @@ -693,4 +693,4 @@
Active work on the deployer and the KitClient takes place in the <url href="https://github.com/HFOSSedu">HFOSSedu Github Organization</url>. Work on HFOSS Kits more generally occurs in <url href="https://gitlab.com/hfossedu/kits">Kits section</url> of the <url href="https://gitlab.com/hfossedu/kits">HFOSSedu GitLab group</url>.
</p>
</subsection>
</section>
</section>