pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Elena.Subbotina
2022-11-25 14:30:23 +03:00
parent da33dda7dc
commit 566b612613
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MsBinaryFile/PptFile/Converter/Animation/Timing_2010.cpp
View File

@ -1,11 +1,8 @@
#include "Timing_2010.h"
<<<<<<< HEAD
#include "../../../OOXML/PPTXFormat/Logic/Colors/SchemeClr.h"
#include "../../../OOXML/PPTXFormat/Logic/Colors/SrgbClr.h"
=======
#include "../../../../OOXML/PPTXFormat/Logic/Colors/SchemeClr.h"
#include "../../../../OOXML/PPTXFormat/Logic/Colors/SrgbClr.h"
>>>>>>> 810f7dc592dc25e2eb685e9dda8695c84d7fd1b7
#include "TimingExeption.h"
#include "TimingUtils.h"