diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
index 4b0fbdc3ad..11fcda4263 100644
--- a/camlibs/ptp2/library.c
+++ b/camlibs/ptp2/library.c
@@ -4093,7 +4093,6 @@ camera_fuji_capture (Camera *camera, CameraCaptureType type, CameraFilePath *pat
 	return GP_ERROR;
 }
 
->>>>>>> upstream/master
 static int
 camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path,
 		GPContext *context)