From c8f6dea1e11c80da428309fb5637b35165c61503 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 27 Mar 2022 17:12:15 +1300 Subject: [PATCH] Conflict fix for `homebrew.jsx` --- client/homebrew/homebrew.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index 84a69b3a7..cb362aa0a 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -32,11 +32,12 @@ const Homebrew = createClass({ } }; }, - componentWillMount : function() { + getInitialState : function() { global.account = this.props.account; global.version = this.props.version; global.enable_v3 = this.props.enable_v3; global.config = this.props.config; + return {}; }, render : function (){ return (