From 662da79fcd6874a15cad342ee57e86408f72326f Mon Sep 17 00:00:00 2001 From: nlensse1 Date: Fri, 17 May 2024 15:42:10 -0400 Subject: [PATCH] update changelog and update merged poetry --- CHANGELOG.md | 2 +- poetry.lock | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df17fe7f..0738130d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added -- [issue/260](https://github.com/podaac/l2ss-py/pull/261): Add gpm cleanup function to add a timeMidScan variable if the timeMidScan variable isn't present. Function takes the years, months, days etc ScanTime variables and creates a single time variable using datetime.datetime library. +- [issue/267](https://github.com/podaac/l2ss-py/pull/261): Add xtrack and atrack dimension options for get_nd_indexers when bounding box subsetting is performed on SNDR. ### Changed ### Deprecated ### Removed diff --git a/poetry.lock b/poetry.lock index 606b752e..1c93abc1 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,8 +1,4 @@ -<<<<<<< HEAD # This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. -======= -# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand. ->>>>>>> develop [[package]] name = "alabaster"