18476 – Merge conflict in configure.in

Issue 18476 - Merge conflict in configure.in

Summary: Merge conflict in configure.in

Status:	CLOSED IRREPRODUCIBLE

Alias:	None

Product:	Build Tools
Classification:	Code
Component:	code (show other issues)
Version:	OOo 1.1 RC3
Hardware:	All Windows 2000

Importance:	P1 (highest) Trivial (vote)
Target Milestone:	OOo 1.1
Assignee:	Martin Hollmichel
QA Contact:	issues@tools

URL:
Keywords:

Depends on:
Blocks:

Reported:	2003-08-21 06:11 UTC by quetschke
Modified:	2003-08-21 17:51 UTC (History)
CC List:	1 user (show)

See Also:
Issue Type:	DEFECT
Latest Confirmation in:	---
Developer Difficulty:	---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this issue.

Description quetschke 2003-08-21 06:11:10 UTC

In Tag OpenOffice_1_1_rc4 there are some merge conflicts in
 config_office/configure.in

Comment 1 quetschke 2003-08-21 06:15:19 UTC

Set target to 1.1

Comment 2 Martin Hollmichel 2003-08-21 14:36:48 UTC

mh->vq: I don't see any ???

Comment 3 quetschke 2003-08-21 17:51:13 UTC

Sorry for the noise :-( I just found a feature/bug of cvs. I did a
"cvs co -P -rOpenOffice_1_1_rc4 OpenOffice" in a dir with an already
present source tree (OOo beta2), and the command merged these
versions. HÃ¤?

Sorry, my fault.