Merges-1
This commit is contained in:
		@@ -33,7 +33,6 @@
 | 
			
		||||
//
 | 
			
		||||
// Adds google3 callback support to CallableTraits.
 | 
			
		||||
//
 | 
			
		||||
#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_
 | 
			
		||||
#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_
 | 
			
		||||
 | 
			
		||||
#endif  //  GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_
 | 
			
		||||
#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
 | 
			
		||||
#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
 | 
			
		||||
#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user