[vlc-commits] macosx/VLCPLModel: remove strayed stashed changed

[Alexandre Janniaux]

vlc | branch: master | Alexandre Janniaux <alexandre.janniaux at gmail.com> | Tue Dec 11 13:37:33 2018 +0100| [22fe22d1a40f867a048e9ad08e74f7e0a7651aed] | committer: Steve Lhomme

macosx/VLCPLModel: remove strayed stashed changed

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=22fe22d1a40f867a048e9ad08e74f7e0a7651aed
---

 modules/gui/macosx/VLCPLModel.m | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/gui/macosx/VLCPLModel.m b/modules/gui/macosx/VLCPLModel.m
index 3b6f2cb10a..9e3e7ef87b 100644
--- a/modules/gui/macosx/VLCPLModel.m
+++ b/modules/gui/macosx/VLCPLModel.m
@@ -1,5 +1,4 @@
 /*****************************************************************************
->>>>>>> Stashed changes
  * VLCPLItem.m: MacOS X interface module
  *****************************************************************************
  * Copyright (C) 2014 VLC authors and VideoLAN