diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2012-11-06 23:35:00 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2012-11-06 23:35:00 +0000 |
| commit | c215586e9fe4e377f86065a3a1435ec8852d6b44 (patch) | |
| tree | 47e79cd813378a5349de3de096437308eeebd214 /editors/openoffice-3-devel | |
| parent | 27b51d591e1615ea7d2db2258620eeb35c99bac1 (diff) | |
Remove redundant conflict.
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=307111
Diffstat (limited to 'editors/openoffice-3-devel')
0 files changed, 0 insertions, 0 deletions