diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-15 11:33:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 11:33:15 -0700 |
| commit | 3c4f437c241b29b848255535518860fd5397d9f5 (patch) | |
| tree | d0d2af46aa44aa3765632227713f4a447c5fd374 /googlemock/include/gmock/gmock-more-actions.h | |
| parent | 87a37c60e3144af5394c3e8c8b4c714bb8b07ad9 (diff) | |
| parent | 997d343dd680e541ef96ce71ee54a91daf2577a0 (diff) | |
| download | googletest-3c4f437c241b29b848255535518860fd5397d9f5.tar.gz googletest-3c4f437c241b29b848255535518860fd5397d9f5.tar.bz2 googletest-3c4f437c241b29b848255535518860fd5397d9f5.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/include/gmock/gmock-more-actions.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-more-actions.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-more-actions.h b/googlemock/include/gmock/gmock-more-actions.h index 1106818d..4d9a28ea 100644 --- a/googlemock/include/gmock/gmock-more-actions.h +++ b/googlemock/include/gmock/gmock-more-actions.h @@ -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) + // Google Mock - a framework for writing C++ mock classes. // |