openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Finish conflict resolution

Browse Source
This commit is contained in:
FeRD (Frank Dana)
2020-10-19 17:42:12 -04:00
parent a1e44edad4
commit cf89891bf0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/TimelineBase.cpp
View File

@@ -28,7 +28,7 @@
* along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "../include/TimelineBase.h"
#include "TimelineBase.h"
using namespace openshot;