spacecruft
/
farmbot_os
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix missed merge conflict issue

pull/447/head
connor rigby 2018-02-15 07:59:14 -08:00
parent 5f57b46ee2
commit 4ab651ece7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/farmbot/bot_state/transport/amqp/amqp.ex
View File

@ -248,7 +248,7 @@ defmodule Farmbot.BotState.Transport.AMQP do
{:ok, %{"body" => config}} ->
# Logger.info 1, "Got fbos config from amqp: #{inspect config}"
old = state.state_cache.configuration
updated = Farmbot.Bootstrap.SettingsSync.apply_os_map(old, config)
updated = Farmbot.Bootstrap.SettingsSync.apply_fbos_map(old, config)
push_bot_state(state.chan, state.bot, %{state.state_cache | configuration: updated})
{:noreply, [], state}
end