From 4ab651ece780107bfef54b95eb42ba83a8102dab Mon Sep 17 00:00:00 2001 From: connor rigby Date: Thu, 15 Feb 2018 07:59:14 -0800 Subject: [PATCH] Fix missed merge conflict issue --- lib/farmbot/bot_state/transport/amqp/amqp.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/farmbot/bot_state/transport/amqp/amqp.ex b/lib/farmbot/bot_state/transport/amqp/amqp.ex index e243a873..40e765c9 100644 --- a/lib/farmbot/bot_state/transport/amqp/amqp.ex +++ b/lib/farmbot/bot_state/transport/amqp/amqp.ex @@ -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