External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-18 16:30:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
mabashian
2019-04-23 13:27:00 -04:00
parent 5ae7cbb43a
commit 38bb4f3f3c
3 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/contexts/Config.jsx
View File

@@ -124,7 +124,7 @@ class Provider extends Component {
return (
<ConfigContext.Provider
value={{
...(propsValue || stateValue),
...value,
fetchMe: this.fetchMe,
updateConfig: this.updateConfig
}}