From b717786205ba4b90843e0b11581b60cd825b2d62 Mon Sep 17 00:00:00 2001
From: Elijah Parker <elijahparker@gmail.com>
Date: Thu, 29 Jun 2017 09:39:43 -0500
Subject: [PATCH] correct merge mistake

---
 camlibs/ptp2/library.c | 1 -
 1 file changed, 1 deletion(-)

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)