Skip to content
Commit 20e6ae7c authored by Nathan Hinton's avatar Nathan Hinton 💬
Browse files

resolved conflict in /src/bin/model/subtitlemodel.cpp

parents e2414819 891c109c
Hide whitespace changes
Inline Side-by-side
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