diff options
| author | sar <devnull@localhost> | 1998-06-12 01:55:19 +0000 |
|---|---|---|
| committer | sar <devnull@localhost> | 1998-06-12 01:55:19 +0000 |
| commit | d6da5a7d128269f1d373147961f4b36a9b2c8c3b (patch) | |
| tree | c748cd868a17b99cc2ebfdfab0ada3aeb63dcbb7 | |
| parent | c37cc0b2ce1b9a342f1fec0c0f5d3059bee3c3a0 (diff) | |
| download | nss-hg-d6da5a7d128269f1d373147961f4b36a9b2c8c3b.tar.gz | |
checkin the NORMANDY_BRANCH join to the trunk, thereby creating NORMANDY_BEACH_BRANCHNORMANDY_BEACH_PRE_MEDIUM_LANDING
| -rw-r--r-- | dbm/macbuild/DBM.Prefix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dbm/macbuild/DBM.Prefix b/dbm/macbuild/DBM.Prefix index 2f6b68e03..3f9ddba77 100644 --- a/dbm/macbuild/DBM.Prefix +++ b/dbm/macbuild/DBM.Prefix @@ -24,5 +24,9 @@ // +<<<<<<< DBM.Prefix #include "MacPrefix.h" #include "DBMConfig.h" +======= +#include "MacPrefix.h" +#include "DBMConfig.h">>>>>>> 3.1.16.1 |