correct merge mistake

timelapseplus · Jun 29, 2017 · b717786 · b717786
1 parent 5a205c8
commit b717786
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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)