Index: pdfium.gyp |
diff --git a/pdfium.gyp b/pdfium.gyp |
index 9e7dd96a37c1a8c84b6592aefbb16157d7fda06c..558e8f7e8cca5f2c2a0761d968333930a9fea774 100644 |
--- a/pdfium.gyp |
+++ b/pdfium.gyp |
@@ -758,6 +758,7 @@ |
'core/src/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp', |
'core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp', |
'core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_embeddertest.cpp', |
Oliver Chang
2015/11/13 17:24:03
++<<<<<<< HEAD
++=======
+ 'core/src/fpdfa
|
+ 'core/src/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp', |
'fpdfsdk/src/fpdf_dataavail_embeddertest.cpp', |
'fpdfsdk/src/fpdfdoc_embeddertest.cpp', |
'fpdfsdk/src/fpdfformfill_embeddertest.cpp', |