Code merges
This commit is contained in:
		@@ -59,8 +59,8 @@
 | 
			
		||||
#include "gmock/gmock-cardinalities.h"
 | 
			
		||||
#include "gmock/gmock-generated-actions.h"
 | 
			
		||||
#include "gmock/gmock-generated-function-mockers.h"
 | 
			
		||||
#include "gmock/gmock-generated-nice-strict.h"
 | 
			
		||||
#include "gmock/gmock-generated-matchers.h"
 | 
			
		||||
#include "gmock/gmock-generated-nice-strict.h"
 | 
			
		||||
#include "gmock/gmock-matchers.h"
 | 
			
		||||
#include "gmock/gmock-more-actions.h"
 | 
			
		||||
#include "gmock/gmock-more-matchers.h"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user