External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-12 23:24:48 -03:30
Code Issues Packages Projects Releases Wiki Activity

addresses PR issues

Browse Source
This commit is contained in:
Alex Corey
2019-04-15 13:31:44 -04:00
parent 178d519f6e
commit 2daf202e52
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/Organizations/screens/Organization/Organization.jsx
View File

@@ -71,14 +71,11 @@ class Organization extends Component {
setBreadcrumb(data);
this.setState({ organization: data, loading: false });
} catch (error) {
<<<<<<< HEAD
handleHttpError(error) || this.setState({ error: true, loading: false });
=======
this.setState({ error: true });
} finally {
this.setState({ loading: false });
this.checkLocation();
>>>>>>> addresses PR issues
}
}
@@ -226,10 +223,5 @@ class Organization extends Component {
);
}
}
<<<<<<< HEAD
export default withNetwork(withRouter(Organization));
=======
export { Organization as _Organization };
export default withRouter(Organization);
>>>>>>> addresses PR issues