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/utils/NamingViewer/BindNewContext.h | |
| parent | 87e4cdb2c157eb359d394c40115e0e6a91c68920 (diff) | |
| parent | 7f58353152673a611a86843b1db6f9453675d087 (diff) | |
| download | ATCD-37a525baec16f7caaa2252394041051c949f301d.tar.gz | |
Fixed merge conflicts
Diffstat (limited to 'TAO/utils/NamingViewer/BindNewContext.h')
| -rw-r--r-- | TAO/utils/NamingViewer/BindNewContext.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/TAO/utils/NamingViewer/BindNewContext.h b/TAO/utils/NamingViewer/BindNewContext.h index 637823c89d0..0ca48484bb8 100644 --- a/TAO/utils/NamingViewer/BindNewContext.h +++ b/TAO/utils/NamingViewer/BindNewContext.h @@ -33,7 +33,6 @@ public: // Implementation protected: - // Generated message map functions //{{AFX_MSG(CBindNewContext) virtual void OnOK(); |