Skip to content

Commit 8ebfa09

Browse files
pascalbaljetpascalbaljet
authored
Update README.md
1 parent f5eb406 commit 8ebfa09

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ $frame = $media->getFrameFromTimecode($timecode);
141141

142142
```
143143

144-
>>>>>>> origin/master
145144
## Changelog
146145

147146
Please see [CHANGELOG](CHANGELOG.md) for more information what has changed recently.

0 commit comments

Comments
 (0)