Skip to content

Commit 3f87150

Browse files
demvladmituritsyn
andcommitted
PSD caption is edited in index.html
Co-authored-by: MikeNomatter <[email protected]>
1 parent 5128a7f commit 3f87150

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

index.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -459,11 +459,7 @@ <h4>Workspace</h4>
459459
<option value="1">Freq. vs Throttle</option>
460460
<option value="3">Freq. vs RPM</option>
461461
<option value="2">Error vs Setpoint</option>
462-
<<<<<<< HEAD
463462
<option value="4">Power spectral density</option>
464-
=======
465-
<option value="4">PSD vs frequency</option>
466-
>>>>>>> 3e1a3a1 (Added PSD curves at spectrum chart)
467463
</select>
468464
</div>
469465

0 commit comments

Comments
 (0)