remove conflict indicator.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4723 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
James LewisMoss 2001-06-18 00:31:53 +00:00
parent 72f4249023
commit f21922a3bd

View File

@ -185,7 +185,6 @@
* src/scm/tip-list.scm: update tip
>>>>>>> 1.619
* src/register/register-common.h: move function defs to
register-common.c