diff options
| author | Conor Burgess <Burgess.Conor@gmail.com> | 2018-08-17 16:15:32 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 16:15:32 (GMT) |
| commit | 687964c84f798ce331fc60f6b8f212410ef46b3c (patch) | |
| tree | 20ed743afd555c46b91361cf864c76643f1d89b2 /googletest/test/gtest_main_unittest.cc | |
| parent | f11a8f9131584cf4009eca8af8a66e920c1b7391 (diff) | |
| parent | 02a8ca87735601466d8c564344f9be493da84708 (diff) | |
| download | googletest-687964c84f798ce331fc60f6b8f212410ef46b3c.zip googletest-687964c84f798ce331fc60f6b8f212410ef46b3c.tar.gz googletest-687964c84f798ce331fc60f6b8f212410ef46b3c.tar.bz2 | |
Merge branch 'master' into fix-argc
Diffstat (limited to 'googletest/test/gtest_main_unittest.cc')
| -rw-r--r-- | googletest/test/gtest_main_unittest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/googletest/test/gtest_main_unittest.cc b/googletest/test/gtest_main_unittest.cc index ecd9bb8..eddedea 100644 --- a/googletest/test/gtest_main_unittest.cc +++ b/googletest/test/gtest_main_unittest.cc @@ -26,8 +26,7 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) + #include "gtest/gtest.h" @@ -41,5 +40,5 @@ TEST(GTestMainTest, ShouldSucceed) { } // namespace -// We are using the main() function defined in src/gtest_main.cc, so -// we don't define it here. +// We are using the main() function defined in gtest_main.cc, so we +// don't define it here. |