Bug 7258

Summary:	Conflicts in polkit-spec.html
Product:	PolicyKit	Reporter:	Torsten Schönfeld <kaffeetisch>
Component:	libpolkit	Assignee:	David Zeuthen (not reading bugmail) <zeuthen>
Status:	RESOLVED INVALID	QA Contact:	David Zeuthen (not reading bugmail) <zeuthen>
Severity:	normal
Priority:	high
Version:	unspecified
Hardware:	x86 (IA32)
OS:	Linux (All)
Whiteboard:
i915 platform:		i915 features:
Attachments:	Conflicting parts

Description Torsten Schönfeld 2006-06-17 08:57:09 UTC

When updating my local checkout, I just got a conflict in
doc/spec/polkit-spec.html.  But I never touched that file.  It looks like it's
generated at build time.  In my opinion, generated files shouldn't be in the
repository.

I'm attaching the diff of the conflict, in case it's relevant.

Comment 1 Torsten Schönfeld 2006-06-17 08:57:30 UTC

Created attachment 5957 [details] [review]
Conflicting parts

Comment 2 David Zeuthen (not reading bugmail) 2009-10-21 10:28:40 UTC

This bug report is for the old version of PolicyKit. Closing as all of the code has been rewritten. Please reopen if the bug report applies to the latest version of PolicyKit. Thanks.

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.