Skip to content

Commit 805da81

Browse files
FLRHWFLRHW
committed
resolving conflicts
2 parents 5951bc0 + 2071364 commit 805da81

103 files changed

Lines changed: 759836 additions & 18205 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 10 additions & 4 deletions

‎HTML/StepUp_module_12to450V-navigate.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@
156156
font-size:14px;
157157
margin-right: 10px;
158158
color: var(--text-color-accent);">
159-
<div style="margin-bottom: 5px;">Rev. 1.0.1+ (Unreleased)</div>
160-
<div>Variant: CHECKED</div>
159+
<div style="margin-bottom: 5px;">Rev. 1.0.2</div>
160+
<div>Variant: RELEASED</div>
161161
</div>
162162
<a href="https://github.com/FLRHW/StepUp_module_12to450V" style="margin-right: 10px;">
163163
<img src="images/logo.png" alt="Logo" style="max-height: 40px; max-width: 51.790393013100434px;">

‎HTML/StepUp_module_12to450V-navigate_3D.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@
167167
font-size:14px;
168168
margin-right: 10px;
169169
color: var(--text-color-accent);">
170-
<div style="margin-bottom: 5px;">Rev. 1.0.1+ (Unreleased)</div>
171-
<div>Variant: CHECKED</div>
170+
<div style="margin-bottom: 5px;">Rev. 1.0.2</div>
171+
<div>Variant: RELEASED</div>
172172
</div>
173173
<a href="https://github.com/FLRHW/StepUp_module_12to450V" style="margin-right: 10px;">
174174
<img src="images/logo.png" alt="Logo" style="max-height: 40px; max-width: 51.790393013100434px;">

‎HTML/StepUp_module_12to450V-navigate_Images.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@
167167
font-size:14px;
168168
margin-right: 10px;
169169
color: var(--text-color-accent);">
170-
<div style="margin-bottom: 5px;">Rev. 1.0.1+ (Unreleased)</div>
171-
<div>Variant: CHECKED</div>
170+
<div style="margin-bottom: 5px;">Rev. 1.0.2</div>
171+
<div>Variant: RELEASED</div>
172172
</div>
173173
<a href="https://github.com/FLRHW/StepUp_module_12to450V" style="margin-right: 10px;">
174174
<img src="images/logo.png" alt="Logo" style="max-height: 40px; max-width: 51.790393013100434px;">

‎HTML/StepUp_module_12to450V-navigate_KiCanvas.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@
167167
font-size:14px;
168168
margin-right: 10px;
169169
color: var(--text-color-accent);">
170-
<div style="margin-bottom: 5px;">Rev. 1.0.1+ (Unreleased)</div>
171-
<div>Variant: CHECKED</div>
170+
<div style="margin-bottom: 5px;">Rev. 1.0.2</div>
171+
<div>Variant: RELEASED</div>
172172
</div>
173173
<a href="https://github.com/FLRHW/StepUp_module_12to450V" style="margin-right: 10px;">
174174
<img src="images/logo.png" alt="Logo" style="max-height: 40px; max-width: 51.790393013100434px;">

‎HTML/StepUp_module_12to450V-navigate_KiRI.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@
167167
font-size:14px;
168168
margin-right: 10px;
169169
color: var(--text-color-accent);">
170-
<div style="margin-bottom: 5px;">Rev. 1.0.1+ (Unreleased)</div>
171-
<div>Variant: CHECKED</div>
170+
<div style="margin-bottom: 5px;">Rev. 1.0.2</div>
171+
<div>Variant: RELEASED</div>
172172
</div>
173173
<a href="https://github.com/FLRHW/StepUp_module_12to450V" style="margin-right: 10px;">
174174
<img src="images/logo.png" alt="Logo" style="max-height: 40px; max-width: 51.790393013100434px;">

‎HTML/StepUp_module_12to450V-navigate_Manufacturing.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@
167167
font-size:14px;
168168
margin-right: 10px;
169169
color: var(--text-color-accent);">
170-
<div style="margin-bottom: 5px;">Rev. 1.0.1+ (Unreleased)</div>
171-
<div>Variant: CHECKED</div>
170+
<div style="margin-bottom: 5px;">Rev. 1.0.2</div>
171+
<div>Variant: RELEASED</div>
172172
</div>
173173
<a href="https://github.com/FLRHW/StepUp_module_12to450V" style="margin-right: 10px;">
174174
<img src="images/logo.png" alt="Logo" style="max-height: 40px; max-width: 51.790393013100434px;">

‎HTML/StepUp_module_12to450V-navigate_Manufacturing_Assembly.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@
167167
font-size:14px;
168168
margin-right: 10px;
169169
color: var(--text-color-accent);">
170-
<div style="margin-bottom: 5px;">Rev. 1.0.1+ (Unreleased)</div>
171-
<div>Variant: CHECKED</div>
170+
<div style="margin-bottom: 5px;">Rev. 1.0.2</div>
171+
<div>Variant: RELEASED</div>
172172
</div>
173173
<a href="https://github.com/FLRHW/StepUp_module_12to450V" style="margin-right: 10px;">
174174
<img src="images/logo.png" alt="Logo" style="max-height: 40px; max-width: 51.790393013100434px;">

‎HTML/StepUp_module_12to450V-navigate_Manufacturing_Fabrication.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@
167167
font-size:14px;
168168
margin-right: 10px;
169169
color: var(--text-color-accent);">
170-
<div style="margin-bottom: 5px;">Rev. 1.0.1+ (Unreleased)</div>
171-
<div>Variant: CHECKED</div>
170+
<div style="margin-bottom: 5px;">Rev. 1.0.2</div>
171+
<div>Variant: RELEASED</div>
172172
</div>
173173
<a href="https://github.com/FLRHW/StepUp_module_12to450V" style="margin-right: 10px;">
174174
<img src="images/logo.png" alt="Logo" style="max-height: 40px; max-width: 51.790393013100434px;">

‎HTML/StepUp_module_12to450V-navigate_Manufacturing_Fabrication_Drill Tables.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@
167167
font-size:14px;
168168
margin-right: 10px;
169169
color: var(--text-color-accent);">
170-
<div style="margin-bottom: 5px;">Rev. 1.0.1+ (Unreleased)</div>
171-
<div>Variant: CHECKED</div>
170+
<div style="margin-bottom: 5px;">Rev. 1.0.2</div>
171+
<div>Variant: RELEASED</div>
172172
</div>
173173
<a href="https://github.com/FLRHW/StepUp_module_12to450V" style="margin-right: 10px;">
174174
<img src="images/logo.png" alt="Logo" style="max-height: 40px; max-width: 51.790393013100434px;">

0 commit comments

Comments
 (0)