Fix merge conflict (CLIMATE-465)
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/2d30ef8e Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/2d30ef8e Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/2d30ef8e Branch: refs/heads/master Commit: 2d30ef8ed998df3cfaba1b53ea17eefae6872a5c Parents: 8b5de9c da7e5a0 Author: Alex <ago...@users.noreply.github.com> Authored: Sat Dec 2 00:16:11 2017 -0800 Committer: Alex <ago...@users.noreply.github.com> Committed: Sat Dec 2 00:16:11 2017 -0800 ---------------------------------------------------------------------- examples/GPM_WRF24_JPDF_comparison.py | 26 +++++++++++ examples/draw_climatology_map_MISR_AOD.py | 26 +++++++++++ examples/esgf_integration_example.py | 15 +++++++ examples/knmi_to_cru31_full_bias.py | 32 ++++++++++++++ examples/model_ensemble_to_rcmed.py | 32 ++++++++++++++ examples/multi_model_evaluation.py | 36 +++++++++++++++ examples/multi_model_taylor_diagram.py | 51 ++++++++++++++++++++++ examples/podaac_integration_example.py | 21 +++++++++ examples/simple_model_to_model_bias.py | 29 ++++++++++++ examples/simple_model_tstd.py | 24 ++++++++++ examples/subregions_portrait_diagram.py | 39 +++++++++++++++++ examples/subregions_rectangular_boundaries.py | 17 ++++++++ examples/subset_TRMM_data_for_NCA_regions.py | 25 ++++++++++- examples/taylor_diagram_example.py | 31 +++++++++++++ examples/temperature_trends_over_CONUS.py | 25 +++++++++++ examples/time_series_with_regions.py | 48 +++++++++++++++----- 16 files changed, 466 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
