PROJ has a wide and varied user base. Some are highly skilled geodesists with a deep knowledge of map projections and reference systems, some are GIS software developers and others are GIS users. All users, regardless of the profession or skill level, has the ability to contribute to PROJ. Here's a few suggestion on how:
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= ======= locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= ======= locatelli-main 48ae38528d (typo fixes) ======= 556d966249 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= c63e6e91bd (Merge pull request #3524 from cffk/merid-update-fix) ======= 74eac2217b (typo fixes) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main d18777a94f (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= <<<<<<< HEAD <<<<<<< HEAD ebd1587dc5 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locationtech-main ======= ======= <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ebd1587dc5 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) ======= a4391c6673 (typo fixes) ======= 320759d5d3 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 8a24938f25 (Merge pull request #3524 from cffk/merid-update-fix) ======= 6e4203f66c (Merge pull request #3524 from cffk/merid-update-fix) ======= 80ac813585 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= c63e6e91bd (Merge pull request #3524 from cffk/merid-update-fix) 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= 48ae38528d (typo fixes) ======= d18777a94f (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 556d966249 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= ebd1587dc5 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main a928f2f739 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 360db021b6 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locationtech-main ======= <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) locatelli-main ======= aa21c6fa76 (typo fixes) ======= ======= a928f2f73 (GEOMESA-3246 Upgrade Arrow to 11.0.0) 05a1868e90 (GEOMESA-3246 Upgrade Arrow to 11.0.0) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD location-main ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main <<<<<<< HEAD ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locationtech-main ======= ======= locatelli-main ======= <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD <<<<<<< HEAD ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main 8a24938f25 (Merge pull request #3524 from cffk/merid-update-fix) ======= 556d966249 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= a928f2f73 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 360db021b (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= locationtech-main ======= b5f4d47b2b (Merge pull request #3524 from cffk/merid-update-fix) ======= 153df87aaa (Merge pull request #3524 from cffk/merid-update-fix) location-main ======= b5f4d47b2b (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main b5f4d47b2b (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= 153df87aaa (Merge pull request #3524 from cffk/merid-update-fix) ======= b609c280f5 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD locatelli-main ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main 86ade66356 (typo fixes) ======= ======= a928f2f739 (GEOMESA-3246 Upgrade Arrow to 11.0.0) 6c49bcd685 (GEOMESA-3246 Upgrade Arrow to 11.0.0) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD locatelli-main ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main c63e6e91bd (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= aa21c6fa76 (typo fixes) 74eac2217b (typo fixes) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD locatelli-main ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main d18777a94f (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= <<<<<<< HEAD ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= ======= 153df87aaa (Merge pull request #3524 from cffk/merid-update-fix) ebd1587dc5 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locationtech-main ======= 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) ======= locationtech-main ======= <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= 208fcbd5e7 (Merge pull request #3524 from cffk/merid-update-fix) ======= bf1dfe8af6 (typo fixes) ======= ======= a928f2f739 (GEOMESA-3246 Upgrade Arrow to 11.0.0) 630900cfbb (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= aa21c6fa76 (typo fixes) a4391c6673 (typo fixes) ======= 320759d5d3 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 8a24938f25 (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= 153df87aaa (Merge pull request #3524 from cffk/merid-update-fix) 6e4203f66c (Merge pull request #3524 from cffk/merid-update-fix) ======= 80ac813585 (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= 86ade66356 (typo fixes) d8e8090c80 (typo fixes) ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= c63e6e91bd (Merge pull request #3524 from cffk/merid-update-fix) 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) ======= ======= d18777a94f (GEOMESA-3246 Upgrade Arrow to 11.0.0) 556d966249 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locationtech-main ======= 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) ======= 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main GeoMesa is an open source suite of tools that enables large-scale geospatial querying and analytics on distributed computing systems. GeoMesa provides spatio-temporal indexing on top of the Accumulo, HBase and Cassandra databases for massive storage of point, line, and polygon data. GeoMesa also provides near real time stream processing of spatio-temporal data by layering spatial semantics on top of Apache Kafka. Through GeoServer, GeoMesa facilitates integration with a wide range of existing mapping clients over standard OGC (Open Geospatial Consortium) APIs and protocols such as WFS and WMS. GeoMesa supports Apache Spark for custom distributed geospatial analytics. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main ======= locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main ======= <<<<<<< HEAD ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= ======= e771dc363 (typo fixes) ======= ======= 360db021b (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= locationtech-main ======= <<<<<<< HEAD <<<<<<< HEAD ======= b5f4d47b2b (Merge pull request #3524 from cffk/merid-update-fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main b5f4d47b2b (Merge pull request #3524 from cffk/merid-update-fix) ======= d18777a94f (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= ebd1587dc5 (Merge pull request #3524 from cffk/merid-update-fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD b5f4d47b2b (Merge pull request #3524 from cffk/merid-update-fix) c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locationtech-main ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main 6e4203f66c (Merge pull request #3524 from cffk/merid-update-fix) ======= 80ac813585 (Merge pull request #3524 from cffk/merid-update-fix) ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 556d966249 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= <<<<<<< HEAD b5f4d47b2b (Merge pull request #3524 from cffk/merid-update-fix) c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= 320759d5d3 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= b5f4d47b2b (Merge pull request #3524 from cffk/merid-update-fix) 8a24938f25 (Merge pull request #3524 from cffk/merid-update-fix) ======= d18777a94f (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= ebd1587dc5 (Merge pull request #3524 from cffk/merid-update-fix) ======= b5f4d47b2b (Merge pull request #3524 from cffk/merid-update-fix) c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= 05a1868e90 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= <<<<<<< HEAD e771dc363a (typo fixes) ======= ======= 360db021b6 (Merge pull request #3524 from cffk/merid-update-fix) ======= e771dc363 (typo fixes) <<<<<<< HEAD aa21c6fa76 (typo fixes) ======= ======= ======= 360db021b (Merge pull request #3524 from cffk/merid-update-fix) b5f4d47b2b (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 153df87aaa (Merge pull request #3524 from cffk/merid-update-fix) location-main ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= ======= 153df87aaa (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= b609c280f5 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main 6c49bcd685 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 630900cfbb (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= d8e8090c80 (typo fixes) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= 6c49bcd685 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= e771dc363a (typo fixes) 86ade66356 (typo fixes) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) e771dc363a (typo fixes) ======= ======= 360db021b6 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 48ae38528d (typo fixes) c63e6e91bd (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= e771dc363 (typo fixes) aa21c6fa76 (typo fixes) 74eac2217b (typo fixes) <<<<<<< HEAD ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= ======= 153df87aaa (Merge pull request #3524 from cffk/merid-update-fix) ebd1587dc5 (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= 208fcbd5e7 (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= e771dc363a (typo fixes) bf1dfe8af6 (typo fixes) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= ======= ======= <<<<<<< HEAD e771dc363a (typo fixes) ======= ======= 360db021b6 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD c63e6e91bd (Merge pull request #3524 from cffk/merid-update-fix) ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= ======= e771dc363 (typo fixes) aa21c6fa76 (typo fixes) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 74eac2217b (typo fixes) ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= <<<<<<< HEAD ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main a4391c6673 (typo fixes) ======= 8a24938f25 (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= ======= 153df87aaa (Merge pull request #3524 from cffk/merid-update-fix) 6e4203f66c (Merge pull request #3524 from cffk/merid-update-fix) ======= 80ac813585 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) ======= c63e6e91bd (Merge pull request #3524 from cffk/merid-update-fix) 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) ======= 74eac2217b (typo fixes) ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= ======= ======= 153df87aaa (Merge pull request #3524 from cffk/merid-update-fix) ebd1587dc5 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= locatelli-main locationtech-main ======= ======= 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= locationtech-main ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main
- Help PROJ-users that is less experienced than yourself.
- Write a bug report
- Request a new feature
- Write documentation for your favorite map projection
- Fix a bug
- Implement a new feature <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main ======= <<<<<<< HEAD ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) ======= e771dc363 (typo fixes) ======= a928f2f73 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) 360db021b (Merge pull request #3524 from cffk/merid-update-fix) ======= 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) locationtech-main ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= d8e8090c80 (typo fixes) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= 5c88d70ae3 (Merge pull request #3524 from cffk/merid-update-fix) ======= 86ade66356 (typo fixes) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD locatelli-main ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main c63e6e91bd (Merge pull request #3524 from cffk/merid-update-fix) ======= 74eac2217b (typo fixes) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD locatelli-main ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= ebd1587dc5 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locationtech-main ======= <<<<<<< HEAD ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= 987375068c (Merge pull request #3524 from cffk/merid-update-fix) ======= bf1dfe8af6 (typo fixes) ======= a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) ======= a4391c6673 (typo fixes) ======= 8a24938f25 (Merge pull request #3524 from cffk/merid-update-fix) ======= 6e4203f66c (Merge pull request #3524 from cffk/merid-update-fix) ======= 80ac813585 (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= 5c88d70ae3 (Merge pull request #3524 from cffk/merid-update-fix) aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) ======= ======= c63e6e91bd (Merge pull request #3524 from cffk/merid-update-fix) 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) ======= ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main 73e3ca4b45 (Merge pull request #3524 from cffk/merid-update-fix) ======= 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) c59e00e4fb (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locationtech-main ======= <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) locatelli-main ======= e771dc363a (typo fixes) ======= a928f2f739 (GEOMESA-3246 Upgrade Arrow to 11.0.0) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locationtech-main ======= <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) 360db021b6 (Merge pull request #3524 from cffk/merid-update-fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main <<<<<<< HEAD <<<<<<< HEAD ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD locationtech-main ======= ======= <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= <<<<<<< HEAD ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 8a24938f25 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48ae38528d (typo fixes) ======= ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= b5f4d47b2b (Merge pull request #3524 from cffk/merid-update-fix) 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) ======= e771dc363 (typo fixes) <<<<<<< HEAD aa21c6fa76 (typo fixes) ======= ======= a928f2f73 (GEOMESA-3246 Upgrade Arrow to 11.0.0) <<<<<<< HEAD 05a1868e90 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) 360db021b (Merge pull request #3524 from cffk/merid-update-fix) b5f4d47b2b (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) 153df87aaa (Merge pull request #3524 from cffk/merid-update-fix) location-main ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) 153df87aaa (Merge pull request #3524 from cffk/merid-update-fix) ======= 73e3ca4b45 (Merge pull request #3524 from cffk/merid-update-fix) b609c280f5 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD locatelli-main ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main 5c88d70ae3 (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= e771dc363a (typo fixes) 86ade66356 (typo fixes) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD locatelli-main ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main 6c49bcd685 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) 360db021b6 (Merge pull request #3524 from cffk/merid-update-fix) c63e6e91bd (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 48ae38528d (typo fixes) locatelli-main ======= <<<<<<< HEAD ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 48ae38528d (typo fixes) locatelli-main ======= 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) ======= e771dc363 (typo fixes) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main aa21c6fa76 (typo fixes) <<<<<<< HEAD 74eac2217b (typo fixes) ======= ======= ======= a928f2f73 (GEOMESA-3246 Upgrade Arrow to 11.0.0) 05a1868e90 (GEOMESA-3246 Upgrade Arrow to 11.0.0) d18777a94f (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= <<<<<<< HEAD ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) locatelli-main ======= ======= 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) 153df87aaa (Merge pull request #3524 from cffk/merid-update-fix) ebd1587dc5 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main 73e3ca4b45 (Merge pull request #3524 from cffk/merid-update-fix) 208fcbd5e7 (Merge pull request #3524 from cffk/merid-update-fix) ======= 987375068c (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= e771dc363a (typo fixes) bf1dfe8af6 (typo fixes) ======= 630900cfbb (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) 360db021b6 (Merge pull request #3524 from cffk/merid-update-fix) a029d873e8 (Merge pull request #3524 from cffk/merid-update-fix) ======= 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) ======= e771dc363 (typo fixes) <<<<<<< HEAD aa21c6fa76 (typo fixes) <<<<<<< HEAD a4391c6673 (typo fixes) ======= ======= ======= a928f2f73 (GEOMESA-3246 Upgrade Arrow to 11.0.0) 05a1868e90 (GEOMESA-3246 Upgrade Arrow to 11.0.0) 320759d5d3 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 8a24938f25 (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) 153df87aaa (Merge pull request #3524 from cffk/merid-update-fix) 6e4203f66c (Merge pull request #3524 from cffk/merid-update-fix) ======= 80ac813585 (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= 5c88d70ae3 (Merge pull request #3524 from cffk/merid-update-fix) aa22876329 (Merge pull request #3524 from cffk/merid-update-fix) ======= d8e8090c80 (typo fixes) ======= ======= 6c49bcd685 (GEOMESA-3246 Upgrade Arrow to 11.0.0) 52579ffb37 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3bd0f77d39 (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= 556d966249 (GEOMESA-3246 Upgrade Arrow to 11.0.0) aa21c6fa76 (typo fixes) <<<<<<< HEAD 74eac2217b (typo fixes) <<<<<<< HEAD 48ae38528d (typo fixes) ======= ======= ======= ======= a928f2f73 (GEOMESA-3246 Upgrade Arrow to 11.0.0) 05a1868e90 (GEOMESA-3246 Upgrade Arrow to 11.0.0) d18777a94f (GEOMESA-3246 Upgrade Arrow to 11.0.0) 556d966249 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 25ac262782 (Merge pull request #3524 from cffk/merid-update-fix) ======= dbc4ff68b0 (Merge pull request #3524 from cffk/merid-update-fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main locationtech-main ======= 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) locationtech-main ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main 885e4882b8 (Merge pull request #3524 from cffk/merid-update-fix) ======= 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main
=======
=======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main =======
locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
- https://www.geomesa.org/ ======= =======
e41aa813db8 (Merge pull request #3524 from cffk/merid-update-fix) ======= 188a4a2926c (Merge pull request #3524 from cffk/merid-update-fix) ======= 6da99dfb276 (Merge pull request #3524 from cffk/merid-update-fix) ======= d4bc3a74d69 (Merge pull request #3524 from cffk/merid-update-fix) ======= e615f409944 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48b994d852f (Merge pull request #3524 from cffk/merid-update-fix) ======= 5122654f2df (Merge pull request #3524 from cffk/merid-update-fix) ======= f7180172424 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main In the following sections you can find some guidelines on how to contribute. As PROJ is managed on GitHub most contributions require that you have a GitHub account. Familiarity with issues and the GitHub Flow is an advantage. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main 6843cbd899f (Merge pull request #3524 from cffk/merid-update-fix) =======
03e7ed27006 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= e41aa813db8 (Merge pull request #3524 from cffk/merid-update-fix) =======
fedb7240349 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 188a4a2926c (Merge pull request #3524 from cffk/merid-update-fix) =======
c05acb75a02 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 6da99dfb276 (Merge pull request #3524 from cffk/merid-update-fix) =======
20962c93f4e (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= d4bc3a74d69 (Merge pull request #3524 from cffk/merid-update-fix) =======
26762293fda (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= e615f409944 (Merge pull request #3524 from cffk/merid-update-fix) =======
468115f7a54 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 48b994d852f (Merge pull request #3524 from cffk/merid-update-fix) =======
fbe28cece9b (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 5122654f2df (Merge pull request #3524 from cffk/merid-update-fix) =======
8d6c968689e (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= f7180172424 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main
The main forum for support for PROJ is the mailing list. You can subscribe to the mailing list here and read the archive here.
If you have questions about the usage of PROJ the mailing list is also the place to go. Please do not use the GitHub issue tracker as a support forum. Your question is much more likely to be answered on the mailing list, as many more people follow that than the issue tracker.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
locatelli-main <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main
6843cbd899f (Merge pull request #3524 from cffk/merid-update-fix) =======
03e7ed27006 (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
e41aa813db8 (Merge pull request #3524 from cffk/merid-update-fix) =======
fedb7240349 (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
188a4a2926c (Merge pull request #3524 from cffk/merid-update-fix) =======
c05acb75a02 (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
6da99dfb276 (Merge pull request #3524 from cffk/merid-update-fix) =======
20962c93f4e (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
d4bc3a74d69 (Merge pull request #3524 from cffk/merid-update-fix) =======
26762293fda (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
e615f409944 (Merge pull request #3524 from cffk/merid-update-fix) =======
468115f7a54 (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
48b994d852f (Merge pull request #3524 from cffk/merid-update-fix) =======
fbe28cece9b (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
5122654f2df (Merge pull request #3524 from cffk/merid-update-fix) =======
8d6c968689e (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
f7180172424 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main
Bug reports are handled in the issue tracker on PROJ's home on GitHub. Writing a good bug report is not easy. But fixing a poorly documented bug is not easy either, so please put in the effort it takes to create a thorough bug report.
A good bug report includes at least:
- A title that quickly explains the problem
- A description of the problem and how it can be reproduced
- Version of PROJ being used
- Version numbers of any other relevant software being used, e.g. operating system
- A description of what already has been done to solve the problem
The more information that is given up front, the more likely it is that a developer will find interest in solving the problem. You will probably get follow-up questions after submitting a bug report. Please answer them in a timely manner if you have an interest in getting the issue solved.
Finally, please only submit bug reports that are actually related to PROJ. If the issue materializes in software that uses PROJ it is likely a problem with that particular software. Make sure that it actually is a PROJ problem before you submit an issue. If you can reproduce the problem only by using tools from PROJ it is definitely a problem with PROJ.
Got an idea for a new feature in PROJ? Submit a thorough description of the new feature in the issue tracker. Please include any technical documents that can help the developer make the new feature a reality. An example of this could be a publicly available academic paper that describes a new projection. Also, including a numerical test case will make it much easier to verify that an implementation of your requested feature actually works as you expect.
Note that not all feature requests are accepted.
PROJ is in dire need of better documentation. Any contributions of documentation are greatly appreciated. The PROJ documentation is available on proj.org. The website is generated with Sphinx. Contributions to the documentation should be made as Pull Requests on GitHub.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD If you intend to document one of PROJ's supported projections please use the Mercator projection as a template.
locatelli-main <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main
- Before starting work, reach out to the community via the developers list or on Gitter to ensure the contribution aligns with the project's goals.
- Most contributions must reference a valid JIRA ticket, unless the change is very small. Sign up for an account at https://geomesa.atlassian.net/issues/?jql= and self-assign a ticket. Alternatively, contact the developers list about doing it for you.
- Ensure that you have signed the Eclipse CLA with the email associated with your GitHub account: https://www.eclipse.org/legal/ECA.php =======
- Contributions to GeoMesa must reference a valid JIRA ticket. Contact the GeoMesa developers list about opening a ticket, or to have a ticket assigned to you.
02dcbe01abc (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
- Contributions to GeoMesa must reference a valid JIRA ticket. Contact the GeoMesa developers list about opening a ticket, or to have a ticket assigned to you.
748db4b7a22 (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
- Contributions to GeoMesa must reference a valid JIRA ticket. Contact the GeoMesa developers list about opening a ticket, or to have a ticket assigned to you.
ddd0a36e25e (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
- Contributions to GeoMesa must reference a valid JIRA ticket. Contact the GeoMesa developers list about opening a ticket, or to have a ticket assigned to you.
9d22f2e966f (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
- Contributions to GeoMesa must reference a valid JIRA ticket. Contact the GeoMesa developers list about opening a ticket, or to have a ticket assigned to you.
d6db4f9ca3f (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
- Contributions to GeoMesa must reference a valid JIRA ticket. Contact the GeoMesa developers list about opening a ticket, or to have a ticket assigned to you.
0fb7cecdfe8 (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
- Contributions to GeoMesa must reference a valid JIRA ticket. Contact the GeoMesa developers list about opening a ticket, or to have a ticket assigned to you.
bb16ba1cc47 (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
- Contributions to GeoMesa must reference a valid JIRA ticket. Contact the GeoMesa developers list about opening a ticket, or to have a ticket assigned to you.
51e60d332b6 (GEOMESA-3246 Upgrade Arrow to 11.0.0)
- Fork the GeoMesa project on GitHub - go to https://github.com/locationtech/geomesa and click 'Fork'.
- Create a branch on your forked project that contains your work. See 'Coding Standards', below.
- Use GitHub to open a pull request against the locationtech GeoMesa repository - from your branch on GitHub, click 'New Pull Request'.
- Respond to comments on your pull request as they are made. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
- When ready, your pull request will be merged by a GeoMesa committer. ======= If you intend to document one of PROJ's supported projections please use the Mercator projection as a template.
8d84cbb0de3 (Merge pull request #3524 from cffk/merid-update-fix) =======
- When ready, your pull request will be merged by an official GeoMesa contributor.
02dcbe01abc (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= If you intend to document one of PROJ's supported projections please use the Mercator projection as a template. 02f3f1b4c77 (Merge pull request #3524 from cffk/merid-update-fix) =======
- When ready, your pull request will be merged by an official GeoMesa contributor.
748db4b7a22 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= If you intend to document one of PROJ's supported projections please use the Mercator projection as a template. 8058ef237c4 (Merge pull request #3524 from cffk/merid-update-fix) =======
- When ready, your pull request will be merged by an official GeoMesa contributor.
ddd0a36e25e (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= If you intend to document one of PROJ's supported projections please use the Mercator projection as a template. 7d040c1b890 (Merge pull request #3524 from cffk/merid-update-fix) =======
- When ready, your pull request will be merged by an official GeoMesa contributor.
9d22f2e966f (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= If you intend to document one of PROJ's supported projections please use the Mercator projection as a template. f8bdc851b25 (Merge pull request #3524 from cffk/merid-update-fix) =======
- When ready, your pull request will be merged by an official GeoMesa contributor.
d6db4f9ca3f (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= If you intend to document one of PROJ's supported projections please use the Mercator projection as a template. 1d0f8189385 (Merge pull request #3524 from cffk/merid-update-fix) =======
- When ready, your pull request will be merged by an official GeoMesa contributor.
0fb7cecdfe8 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= If you intend to document one of PROJ's supported projections please use the Mercator projection as a template. bc01e049d28 (Merge pull request #3524 from cffk/merid-update-fix) =======
- When ready, your pull request will be merged by an official GeoMesa contributor.
bb16ba1cc47 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= If you intend to document one of PROJ's supported projections please use the Mercator projection as a template. b2762bef82c (Merge pull request #3524 from cffk/merid-update-fix) =======
- When ready, your pull request will be merged by an official GeoMesa contributor.
51e60d332b6 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= If you intend to document one of PROJ's supported projections please use the Mercator projection as a template. 3f25c01d781 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main
- An initial pull request should be up-to-date with the current main branch.
- The pull request title should consist of a JIRA ticket number followed by a short description, with additional ======= <<<<<<< HEAD ======= =======
02f3f1b4c77 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD ======= 03e7ed27006 (GEOMESA-3246 Upgrade Arrow to 11.0.0) 02dcbe01abc (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= 8058ef237c4 (Merge pull request #3524 from cffk/merid-update-fix) ======= ddd0a36e25e (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 7d040c1b890 (Merge pull request #3524 from cffk/merid-update-fix) ======= 9d22f2e966f (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= f8bdc851b25 (Merge pull request #3524 from cffk/merid-update-fix) ======= d6db4f9ca3f (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 1d0f8189385 (Merge pull request #3524 from cffk/merid-update-fix) ======= 0fb7cecdfe8 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= bc01e049d28 (Merge pull request #3524 from cffk/merid-update-fix) ======= bb16ba1cc47 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= b2762bef82c (Merge pull request #3524 from cffk/merid-update-fix) ======= 51e60d332b6 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 3f25c01d781 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main <<<<<<< HEAD ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= 03e7ed27006 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= fedb7240349 (GEOMESA-3246 Upgrade Arrow to 11.0.0) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= c05acb75a02 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 20962c93f4e (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 26762293fda (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 468115f7a54 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= fbe28cece9b (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 8d6c968689e (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= <<<<<<< HEAD ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main 748db4b7a22 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= c05acb75a02 (GEOMESA-3246 Upgrade Arrow to 11.0.0) <<<<<<< HEAD ddd0a36e25e (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= 20962c93f4e (GEOMESA-3246 Upgrade Arrow to 11.0.0) <<<<<<< HEAD 9d22f2e966f (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= 26762293fda (GEOMESA-3246 Upgrade Arrow to 11.0.0) <<<<<<< HEAD d6db4f9ca3f (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= 468115f7a54 (GEOMESA-3246 Upgrade Arrow to 11.0.0) <<<<<<< HEAD 0fb7cecdfe8 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= fbe28cece9b (GEOMESA-3246 Upgrade Arrow to 11.0.0) <<<<<<< HEAD bb16ba1cc47 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= ======= 8d6c968689e (GEOMESA-3246 Upgrade Arrow to 11.0.0) 51e60d332b6 (GEOMESA-3246 Upgrade Arrow to 11.0.0) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main
- An initial pull request should consist of a single commit, rebased on top of the current main branch.
- Additional commits can be added in response to code review comments.
- The commit message must consist of a JIRA ticket number followed by a short description, with additional
8d84cbb0de3 (Merge pull request #3524 from cffk/merid-update-fix) information in bullets below as required.
- See e.g. https://github.com/locationtech/geomesa/commit/1f345132a717816d5a4951f73b2b73537fce305b
- Code must be reasonably formatted. Scala does not conform well to automatic formatting, but in general <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD GeoMesa tries to adhere to the official Scala style guide: https://docs.scala-lang.org/style/
- Code should include unit tests when appropriate. =======
6843cbd899f (Merge pull request #3524 from cffk/merid-update-fix) ======= GeoMesa tries to adhere to the official Scala style guide: http://docs.scala-lang.org/style/
- Code should include unit tests when appropriate.
03e7ed27006 (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
e41aa813db8 (Merge pull request #3524 from cffk/merid-update-fix) ======= GeoMesa tries to adhere to the official Scala style guide: http://docs.scala-lang.org/style/
- Code should include unit tests when appropriate.
fedb7240349 (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
188a4a2926c (Merge pull request #3524 from cffk/merid-update-fix) ======= GeoMesa tries to adhere to the official Scala style guide: http://docs.scala-lang.org/style/
- Code should include unit tests when appropriate.
c05acb75a02 (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
6da99dfb276 (Merge pull request #3524 from cffk/merid-update-fix) ======= GeoMesa tries to adhere to the official Scala style guide: http://docs.scala-lang.org/style/
- Code should include unit tests when appropriate.
20962c93f4e (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
d4bc3a74d69 (Merge pull request #3524 from cffk/merid-update-fix) ======= GeoMesa tries to adhere to the official Scala style guide: http://docs.scala-lang.org/style/
- Code should include unit tests when appropriate.
26762293fda (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
e615f409944 (Merge pull request #3524 from cffk/merid-update-fix) ======= GeoMesa tries to adhere to the official Scala style guide: http://docs.scala-lang.org/style/
- Code should include unit tests when appropriate.
468115f7a54 (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
48b994d852f (Merge pull request #3524 from cffk/merid-update-fix) ======= GeoMesa tries to adhere to the official Scala style guide: http://docs.scala-lang.org/style/
- Code should include unit tests when appropriate.
fbe28cece9b (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
5122654f2df (Merge pull request #3524 from cffk/merid-update-fix) ======= GeoMesa tries to adhere to the official Scala style guide: http://docs.scala-lang.org/style/
- Code should include unit tests when appropriate.
8d6c968689e (GEOMESA-3246 Upgrade Arrow to 11.0.0) =======
f7180172424 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main
Committers are the front line gatekeepers to keep the code base clear of improperly contributed code. It is important to the PROJ users, developers and the OSGeo foundation to avoid contributing any code to the project without it being clearly licensed under the project license.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
locatelli-main <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main <<<<<<< HEAD <<<<<<< HEAD ======= locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main GeoMesa uses the License Maven Plugin to help manage copyright headers. This plugin runs as part of the default build, and will fail if any files do not contain a valid header. To add a new copyright owner, a template file can be placed under
build/copyright/and added to the<validHeaders>block in the root pom.xml. ======= ======= e41aa813db8 (Merge pull request #3524 from cffk/merid-update-fix) ======= 188a4a2926c (Merge pull request #3524 from cffk/merid-update-fix) ======= 6da99dfb276 (Merge pull request #3524 from cffk/merid-update-fix) ======= d4bc3a74d69 (Merge pull request #3524 from cffk/merid-update-fix) ======= e615f409944 (Merge pull request #3524 from cffk/merid-update-fix) ======= 48b994d852f (Merge pull request #3524 from cffk/merid-update-fix) ======= 5122654f2df (Merge pull request #3524 from cffk/merid-update-fix) ======= f7180172424 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main Generally speaking the key issues are that those providing code to be included in the repository understand that the code will be released under the MIT/X license, and that the person providing the code has the right to contribute the code. For the committer themselves understanding about the license is hopefully clear. For other contributors, the committer should verify the understanding unless the committer is very comfortable that the contributor understands the license (for instance frequent contributors). <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main <<<<<<< HEAD ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main 6843cbd899f (Merge pull request #3524 from cffk/merid-update-fix) ======= ======= fedb7240349 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= c05acb75a02 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 20962c93f4e (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 26762293fda (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 468115f7a54 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= fbe28cece9b (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 8d6c968689e (GEOMESA-3246 Upgrade Arrow to 11.0.0) GeoMesa uses the License Maven Plugin to help manage copyright headers. This plugin runs as part of the default build, and will fail if any files do not contain a valid header. To add a new copyright owner, a template file can be placed underbuild/copyright/and added to the<validHeaders>block in the root pom.xml. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 03e7ed27006 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= e41aa813db8 (Merge pull request #3524 from cffk/merid-update-fix) ======= fedb7240349 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 188a4a2926c (Merge pull request #3524 from cffk/merid-update-fix) ======= c05acb75a02 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 6da99dfb276 (Merge pull request #3524 from cffk/merid-update-fix) ======= 20962c93f4e (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= d4bc3a74d69 (Merge pull request #3524 from cffk/merid-update-fix) ======= 26762293fda (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= e615f409944 (Merge pull request #3524 from cffk/merid-update-fix) ======= 468115f7a54 (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 48b994d852f (Merge pull request #3524 from cffk/merid-update-fix) ======= fbe28cece9b (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= 5122654f2df (Merge pull request #3524 from cffk/merid-update-fix) ======= 8d6c968689e (GEOMESA-3246 Upgrade Arrow to 11.0.0) ======= f7180172424 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main ======= locatelli-main
If the contribution was developed on behalf of an employer (on work time, as part of a work project, etc) then it is important that an appropriate representative of the employer understand that the code will be contributed under the MIT/X license. The arrangement should be cleared with an authorized supervisor/manager, etc.
The code should be developed by the contributor, or the code should be from a source which can be rightfully contributed such as from the public domain, or from an open source project under a compatible license.
All unusual situations need to be discussed and/or documented.
Committer should adhere to the following guidelines, and may be personally legally liable for improperly contributing code to the source repository:
- Make sure the contributor (and possibly employer) is aware of the contribution terms.
- Code coming from a source other than the contributor (such as adapted from another project) should be clearly marked as to the original source, copyright holders, license terms and so forth. This information can be in the file headers, but should also be added to the project licensing file if not exactly matching normal project licensing (COPYING).
- Existing copyright headers and license text should never be stripped from a file. If a copyright holder wishes to give up copyright they must do so in writing to the foundation before copyright messages are removed. If license terms are changed it has to be by agreement (written in email is ok) of the copyright holders.
- Code with licenses requiring credit, or disclosure to users should be added to COPYING.
- When substantial contributions are added to a file (such as substantial patches) the author/contributor should be added to the list of copyright holders for the file.
- If there is uncertainty about whether a change is proper to contribute to the code base, please seek more information from the project steering committee, or the foundation legal counsel.
The code contribution section of this CONTRIBUTING file is inspired by PDAL's and the legalese section is modified from GDAL committer guidelines