Resolve conflict
commit f3927ca6d2a3ede0ab9a386d17fbb48fbd33c1fd
2 parents 945bb22 + 3f04009
@Javier Goñi Javier Goñi authored on 18 Sep 2017
Showing 140 changed files
View
ClosedXML/Attributes/XLColumnAttribute.cs
Too large
View
ClosedXML/ClosedXML.csproj
Too large
View
ClosedXML/Excel/CalcEngine/CalcEngine.cs
Too large
View
ClosedXML/Excel/CalcEngine/Exceptions/CalcEngineException.cs 0 → 100644
Too large
View
ClosedXML/Excel/CalcEngine/Exceptions/CellReferenceException.cs 0 → 100644
Too large
View
ClosedXML/Excel/CalcEngine/Exceptions/CellValueException.cs 0 → 100644
Too large
View
ClosedXML/Excel/CalcEngine/Exceptions/DivisionByZeroException.cs 0 → 100644
Too large
View
ClosedXML/Excel/CalcEngine/Exceptions/NameNotRecognizedException.cs 0 → 100644
Too large
View
ClosedXML/Excel/CalcEngine/Exceptions/NoValueAvailableException.cs 0 → 100644
Too large
View
ClosedXML/Excel/CalcEngine/Exceptions/NullValueException.cs 0 → 100644
Too large
View
ClosedXML/Excel/CalcEngine/Exceptions/NumberException.cs 0 → 100644
Too large
View
ClosedXML/Excel/CalcEngine/Expression.cs
Too large
View
ClosedXML/Excel/CalcEngine/ExpressionParseException.cs 0 → 100644
Too large
View
ClosedXML/Excel/CalcEngine/Functions/Information.cs
Too large
View
ClosedXML/Excel/CalcEngine/Functions/Lookup.cs
Too large
View
ClosedXML/Excel/CalcEngine/Functions/MathTrig.cs
Too large
View
ClosedXML/Excel/CalcEngine/Functions/Text.cs
Too large
View
ClosedXML/Excel/CalcEngine/Functions/XLMatrix.cs
Too large
View
ClosedXML/Excel/CalcEngine/Token.cs
Too large
View
ClosedXML/Excel/CalcEngine/XLCalcEngine.cs
Too large
View
ClosedXML/Excel/Cells/IXLCell.cs
Too large
View
ClosedXML/Excel/Cells/XLCell.cs
Too large
View
ClosedXML/Excel/Cells/XLCells.cs
Too large
View
ClosedXML/Excel/Cells/XLCellsCollection.cs
Too large
View
ClosedXML/Excel/Columns/XLColumn.cs
Too large
View
ClosedXML/Excel/Coordinates/IXLAddress.cs
Too large
View
ClosedXML/Excel/Coordinates/XLAddress.cs
Too large
View
ClosedXML/Excel/DataValidation/XLDataValidation.cs
Too large
View
ClosedXML/Excel/Drawings/IXLPicture.cs
Too large
View
ClosedXML/Excel/Drawings/XLPicture.cs
Too large
View
ClosedXML/Excel/Drawings/XLPictures.cs
Too large
View
ClosedXML/Excel/Hyperlinks/XLHyperlink_Internal.cs
Too large
View
ClosedXML/Excel/Misc/XLFormula.cs
Too large
View
ClosedXML/Excel/NamedRanges/XLNamedRanges.cs
Too large
View
ClosedXML/Excel/PivotTables/IXLPivotFields.cs
Too large
View
ClosedXML/Excel/PivotTables/XLPivotFields.cs
Too large
View
ClosedXML/Excel/Ranges/IXLRange.cs
Too large
View
ClosedXML/Excel/Ranges/IXLRangeAddress.cs
Too large
View
ClosedXML/Excel/Ranges/IXLRangeBase.cs
Too large
View
ClosedXML/Excel/Ranges/XLRange.cs
Too large
View
ClosedXML/Excel/Ranges/XLRangeAddress.cs
Too large
View
ClosedXML/Excel/Ranges/XLRangeBase.cs
Too large
View
ClosedXML/Excel/Ranges/XLRangeColumn.cs
Too large
View
ClosedXML/Excel/Rows/IXLRow.cs
Too large
View
ClosedXML/Excel/Rows/XLRow.cs
Too large
View
ClosedXML/Excel/SaveOptions.cs 0 → 100644
Too large
View
ClosedXML/Excel/Style/Colors/XLColor_Public.cs
Too large
View
ClosedXML/Excel/Style/XLPredefinedFormat.cs 0 → 100644
Too large
View
ClosedXML/Excel/Tables/IXLTable.cs
Too large
View
ClosedXML/Excel/Tables/IXLTableField.cs
Too large
View
ClosedXML/Excel/Tables/XLTable.cs
Too large
View
ClosedXML/Excel/Tables/XLTableField.cs
Too large
View
ClosedXML/Excel/XLWorkbook.cs
Too large
View
ClosedXML/Excel/XLWorkbook_ImageHandling.cs
Too large
View
ClosedXML/Excel/XLWorkbook_Load.cs
Too large
View
ClosedXML/Excel/XLWorkbook_Save.cs
Too large
View
ClosedXML/Excel/XLWorksheet.cs
Too large
View
ClosedXML/Excel/XLWorksheets.cs
Too large
View
ClosedXML/Extensions.cs
Too large
View
ClosedXML/Properties/AssemblyVersionInfo.cs
Too large
View
ClosedXML/XLHelper.cs
Too large
View
ClosedXML_Examples/ClosedXML_Examples.csproj
Too large
View
ClosedXML_Examples/Creating/CreateFiles.cs
Too large
View
ClosedXML_Examples/Misc/AddingDataSet.cs
Too large
View
ClosedXML_Examples/Misc/Collections.cs
Too large
View
ClosedXML_Examples/Misc/CopyingWorksheets.cs
Too large
View
ClosedXML_Examples/Misc/Formulas.cs
Too large
View
ClosedXML_Examples/Misc/InsertingData.cs
Too large
View
ClosedXML_Examples/Misc/InsertingTables.cs 100644 → 0
Too large
View
ClosedXML_Examples/PivotTables/PivotTables.cs
Too large
View
ClosedXML_Examples/Ranges/UsingTables.cs 100644 → 0
Too large
View
ClosedXML_Examples/Styles/UsingPhonetics.cs
Too large
View
ClosedXML_Examples/Tables/InsertingTables.cs 0 → 100644
Too large
View
ClosedXML_Examples/Tables/ResizingTables.cs 0 → 100644
Too large
View
ClosedXML_Examples/Tables/UsingTables.cs 0 → 100644
Too large
View
ClosedXML_Tests/ClosedXML_Tests.csproj
Too large
View
ClosedXML_Tests/Examples/MiscTests.cs
Too large
View
ClosedXML_Tests/Examples/RangesTests.cs
Too large
View
ClosedXML_Tests/Examples/StylesTests.cs
Too large
View
ClosedXML_Tests/Examples/TablesTests.cs 0 → 100644
Too large
View
ClosedXML_Tests/Excel/AutoFilters/AutoFilterTests.cs
Too large
View
ClosedXML_Tests/Excel/CalcEngine/CalcEngineExceptionTests.cs 0 → 100644
Too large
View
ClosedXML_Tests/Excel/CalcEngine/FunctionsTests.cs
Too large
View
ClosedXML_Tests/Excel/CalcEngine/InformationTests.cs
Too large
View
ClosedXML_Tests/Excel/CalcEngine/LookupTests.cs
Too large
View
ClosedXML_Tests/Excel/CalcEngine/MathTrigTests.cs 0 → 100644
Too large
View
ClosedXML_Tests/Excel/CalcEngine/StatisticalTests.cs
Too large
View
ClosedXML_Tests/Excel/CalcEngine/TextTests.cs
Too large
View
ClosedXML_Tests/Excel/Cells/XLCellTests.cs
Too large
View
ClosedXML_Tests/Excel/Coordinates/XLAddressTests.cs
Too large
View
ClosedXML_Tests/Excel/ImageHandling/PictureTests.cs
Too large
View
ClosedXML_Tests/Excel/Loading/LoadingTests.cs
Too large
View
ClosedXML_Tests/Excel/Misc/FormulaTests.cs
Too large
View
ClosedXML_Tests/Excel/Misc/HyperlinkTests.cs 0 → 100644
Too large
View
ClosedXML_Tests/Excel/Misc/SearchTests.cs 0 → 100644
Too large
View
ClosedXML_Tests/Excel/NamedRanges/NamedRangesTests.cs
Too large
View
ClosedXML_Tests/Excel/Ranges/XLRangeAddressTests.cs
Too large
View
ClosedXML_Tests/Excel/Rows/RowTests.cs
Too large
View
ClosedXML_Tests/Excel/Saving/SavingTests.cs
Too large
View
ClosedXML_Tests/Excel/Styles/NumberFormatTests.cs
Too large
View
ClosedXML_Tests/Excel/Tables/TablesTests.cs
Too large
View
ClosedXML_Tests/Excel/Worksheets/XLWorksheetTests.cs
Too large
View
ClosedXML_Tests/OleDb/OleDbTests.cs
Too large
View
ClosedXML_Tests/Resource/Examples/Columns/DeletingColumns.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Comments/AddingComments.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFIsBlank.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/ConditionalFormatting/CFNotBlank.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/ImageHandling/ImageAnchors.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/ImageHandling/ImageFormats.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Misc/BlankCells.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Misc/CopyingWorksheets.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Misc/DataTypes.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Misc/DataTypesUnderDifferentCulture.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Misc/Formulas.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Misc/FormulasWithEvaluation.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Misc/HideUnhide.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Misc/Hyperlinks.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Misc/InsertingData.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Misc/InsertingTables.xlsx 100644 → 0
Too large
View
ClosedXML_Tests/Resource/Examples/Misc/MergeMoves.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Misc/ShiftingFormulas.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/PivotTables/PivotTables.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Ranges/ClearingRanges.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Ranges/InsertingDeletingRows.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Ranges/NamedRanges.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Ranges/SelectingRanges.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Ranges/ShiftingRanges.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Ranges/SortExample.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Ranges/TransposeRangesPlus.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Ranges/UsingTables.xlsx 100644 → 0
Too large
View
ClosedXML_Tests/Resource/Examples/Ranges/WalkingRanges.xlsx
Too large
View
ClosedXML_Tests/Resource/Examples/Styles/UsingPhonetics.xlsx 0 → 100644
Too large
View
ClosedXML_Tests/Resource/Examples/Tables/InsertingTables.xlsx 0 → 100644
Too large
View
ClosedXML_Tests/Resource/Examples/Tables/ResizingTables.xlsx 0 → 100644
Too large
View
ClosedXML_Tests/Resource/Examples/Tables/UsingTables.xlsx 0 → 100644
Too large
View
ClosedXML_Tests/Resource/Misc/DuplicateImageNames.xlsx 0 → 100644
Too large
View
ClosedXML_Tests/Resource/Misc/TableHeadersWithLineBreaks.xlsx 0 → 100644
Too large
View
ClosedXML_Tests/Resource/Misc/TableWithNameNull.xlsx 0 → 100644
Too large
View
ClosedXML_Tests/Utils/TemporaryFile.cs 0 → 100644
Too large
View
ClosedXML_Tests/packages.config
Too large