diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-12-12 16:02:27 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-12-12 16:02:27 +0100 |
| commit | 37a525baec16f7caaa2252394041051c949f301d (patch) | |
| tree | d02343e8d3b24655b082b117d63879ff83e89e7f /TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp | |
| parent | 87e4cdb2c157eb359d394c40115e0e6a91c68920 (diff) | |
| parent | 7f58353152673a611a86843b1db6f9453675d087 (diff) | |
| download | ATCD-37a525baec16f7caaa2252394041051c949f301d.tar.gz | |
Fixed merge conflicts
Diffstat (limited to 'TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp')
| -rw-r--r-- | TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp b/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp index b4c93c1b20b..40e905106ff 100644 --- a/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp +++ b/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp @@ -94,13 +94,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) - - - - - - - - - - |