Skip to content

Commit 0ee7dd5

Browse files
fix: issue with stash
1 parent 4a363e4 commit 0ee7dd5

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

src/dve/reporting/excel_report.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,7 @@ def _add_submission_info(self, status: str, summary: Worksheet):
137137
summary.append(["", "Status", status])
138138

139139
for key, value in self.summary_dict.items():
140-
<<<<<<< Updated upstream
141140
summary.append(["", key, str(value)])
142-
=======
143141
if key == "Reporting Period End":
144142
_rp_end_value = datetime.strptime(value, "%Y-%m-%d %H:%M:%S")
145143
value = (
@@ -148,7 +146,6 @@ def _add_submission_info(self, status: str, summary: Worksheet):
148146
else _rp_end_value + timedelta(hours=23, minutes=59, seconds=59)
149147
)
150148
summary.append(["", _key_renames.get(key, key), str(value)])
151-
>>>>>>> Stashed changes
152149

153150
summary.append(["", ""])
154151

0 commit comments

Comments
 (0)