Commit 86433879 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Apply 1 suggestion(s) to 1 file(s)

parent 99331cff
Pipeline #197162 passed with stage
in 9 minutes and 49 seconds
......@@ -159,11 +159,7 @@ void SubtitleModel::importSubtitle(const QString &filePath, int offset, bool ext
srtTime = timeLine.split(separator);
if (srtTime.count() > endIndex) {
start = srtTime.at(0);
<<<<<<< HEAD
startPos = stringtoTime(start)/transformMult;
=======
startPos = stringtoTime(start);
>>>>>>> master
end = srtTime.at(endIndex);
endPos = stringtoTime(end)/transformMult;
} else {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment