Fix conflict

This commit is contained in:
Sebastian-byte
2021-07-25 18:34:28 -05:00
parent 9069e9c9d0
commit 65d3068e9f
1150 changed files with 6065 additions and 1550 deletions

View File

@@ -0,0 +1,9 @@
#pragma once
#include <QString>
#include <QDateTime>
/// take the timestamp used by S3 and turn it into QDateTime
QDateTime timeFromS3Time(QString str);
/// take a timestamp and convert it into an S3 timestamp
QString timeToS3Time(QDateTime);