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

[Alexandre Janniaux]

---
 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
-- 
2.19.2