fixed conflicts

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@1019 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Scott Fritzinger
2000-09-07 18:42:12 +00:00
parent c99cffc302
commit 2be6e0842e

View File

@@ -301,6 +301,8 @@ int camera_summary (Camera *camera, CameraText *summary) {
/* DC120Data *dd = camera->camlib_data; */
strcpy(summary->text, "No summary information yet");
return (GP_OK);
}