kristjank/TeraHz
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:cls-02/TeraHz

Browse Source
This commit is contained in:
Kristjan Komlosi committed 2019-10-06 17:02:30 +02:00
2 parents 47937d8bb8 e21efc1b4a
commit c049d5e8df
1 file changed
+4
Download Patch File Download Diff File Expand all files Collapse all files
frontend/frontend.js
+4
View File
@@ -48,7 +48,11 @@ function graphSpectralData (obj, dom) {
responsive: false, responsive: false,
legend: { legend: {
labels: { labels: {
<<<<<<< HEAD
fontColor: '#ffffff' fontColor: '#ffffff'
=======
fontcolor: '#ffffff'
>>>>>>> e21efc1b4a57fb153e2bbc832e44354dd9aa5d31
} }
} }
} }