Fix merge artefacts

volkszaehler · Mar 25, 2020 · 0108991 · 0108991
1 parent 510de61
commit 0108991
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 45 deletions.
diff --git a/assets/index.html b/assets/index.html
@@ -358,7 +358,7 @@ <h1>Measurements</h1>
 						<td class="col-3" v-if="pop(m.THD)">${ m.THD }</td>
 						<td class="col-3" v-else>&mdash;</td>
 					</tr>
-					<tr class="d-flex" v-if="populated(m.PhaseAngle)">
+					<tr class="d-flex" v-if="pop(m.PhaseAngle)">
 						<td class="col-3">Phase Angle</td>
 						<td class="col-2">&mdash;</td>
 						<td class="col-2">&mdash;</td>

diff --git a/server/assets.go b/server/assets.go