IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14259 from grafana/14237-prevent-table-crash

Browse Source 
change obj order when merging so that correct format is being used
This commit is contained in:
David
2018-11-30 16:37:50 +01:00
committed by GitHub
parent 314152ebf6 12ba314e24
commit fab2597650
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/explore/Explore.tsx
View File

@@ -589,8 +589,8 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
const configuredQueries = [ const configuredQueries = [
{ {
...queryOptions,
...query, ...query,
...queryOptions,
}, },
]; ];