Resolve conflicts.

This commit is contained in:
Mark Murray 2000-08-20 09:51:08 +00:00
parent 169c95233c
commit 24ad19c546
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=64872

View file

@ -3306,6 +3306,10 @@ typedef struct am_table_short AMTS;
#endif /* IAMSUID */
#ifdef I_LIBUTIL
# include <libutil.h> /* setproctitle() in some FreeBSDs */
#endif
/* and finally... */
#define PERL_PATCHLEVEL_H_IMPLICIT
#include "patchlevel.h"