diff options
| author | cyeh <devnull@localhost> | 1998-06-23 05:19:54 +0000 |
|---|---|---|
| committer | cyeh <devnull@localhost> | 1998-06-23 05:19:54 +0000 |
| commit | fd6c3c8c256aad1d9f8daf7d85b55239eb6a4650 (patch) | |
| tree | c2cef09b4bd2dce2911e69ca7aece1e38c690a7d /dbm/macbuild | |
| parent | 74cc1d5eda3e4db6af31ed99c8e18a2e7696f7c0 (diff) | |
| download | nss-hg-fd6c3c8c256aad1d9f8daf7d85b55239eb6a4650.tar.gz | |
remove conflict caused by NORAMNDY_BEACH merge.PLUGIN_MODULE_19980708_BASENORMANDY_DDAY_BASE
Diffstat (limited to 'dbm/macbuild')
| -rw-r--r-- | dbm/macbuild/DBM.Prefix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/dbm/macbuild/DBM.Prefix b/dbm/macbuild/DBM.Prefix index 3f9ddba77..a5229addf 100644 --- a/dbm/macbuild/DBM.Prefix +++ b/dbm/macbuild/DBM.Prefix @@ -24,9 +24,6 @@ // -<<<<<<< DBM.Prefix #include "MacPrefix.h" #include "DBMConfig.h" -======= -#include "MacPrefix.h" -#include "DBMConfig.h">>>>>>> 3.1.16.1 + |