From: bugreport%peshkin.net <>
Date: Sat, 24 Aug 2002 21:51:27 +0000 (+0000)
Subject: Fixed merge problem from checkin of 143826 - No bug
X-Git-Tag: bugzilla-2.17.1~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=942165b87532fd7f63042d5ff2e95df7af5e8400;p=thirdparty%2Fbugzilla.git

Fixed merge problem from checkin of 143826 - No bug
---

diff --git a/attachment.cgi b/attachment.cgi
index 9f3b39fccd..a94ebc8357 100755
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -692,8 +692,8 @@ sub update
            SET     description = $quoteddescription , 
                    mimetype = $quotedcontenttype , 
                    ispatch = $::FORM{'ispatch'} , 
-                   isobsolete = $::FORM{'isobsolete'}
-                   isprivate = $::FORM{'isprivate'} , 
+                   isobsolete = $::FORM{'isobsolete'} ,
+                   isprivate = $::FORM{'isprivate'} 
            WHERE   attach_id = $::FORM{'id'}
          ");