search

AG-Schumann / Doberman

Distributed supervisory control, data acquisition, and monitoring software for small- to medium-size experiments
MIT License
0 stars 1 forks source link

Sms alarm fix #194

Closed adambrown1 closed 1 year ago

adambrown1 commented 1 year ago

Small bug fix

adambrown1 commented 1 year ago

Merge #195 into this branch first

jarongrigat commented 1 year ago

Can we merge #195 first, please? Gets messy otherwise.

adambrown1 commented 1 year ago

Can we merge #195 first, please? Gets messy otherwise.

I don't understand. My idea was to merge #195 into here and then both into experimental at once. Otherwise we need to rebase #195 onto experimental. Or we can first merge this one and then merge that branch directly.

jarongrigat commented 1 year ago

Sure, makes sense :)