Resolve conflicts after rebase.
1 parent ae18a81 commit 2566c96fd40c57c48b7869817cb442dd95a44ccc
@Francois Botha Francois Botha authored on 20 Mar 2017
Showing 2 changed files
View
ClosedXML/Excel/XLWorkbook_Load.cs
View
ClosedXML_Tests/Resource/Examples/PivotTables/PivotTables.xlsx
Not supported