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/tao/Profile.cpp | |
| parent | 87e4cdb2c157eb359d394c40115e0e6a91c68920 (diff) | |
| parent | 7f58353152673a611a86843b1db6f9453675d087 (diff) | |
| download | ATCD-37a525baec16f7caaa2252394041051c949f301d.tar.gz | |
Fixed merge conflicts
Diffstat (limited to 'TAO/tao/Profile.cpp')
| -rw-r--r-- | TAO/tao/Profile.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index 45de2e87c27..9bc48cb6352 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -868,7 +868,6 @@ TAO_Unknown_Profile::create_profile_body (TAO_OutputCDR &) const } - // ************************************************************* // Operators for TAO_opaque encoding and decoding // ************************************************************* |