Commit 3f7c4af

committed

Merge branch 'master' into snakeyaml-engine

# Conflicts: # yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLFactory.java # yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLGenerator.java # yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLParser.java # yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/snakeyaml/error/MarkedYAMLException.java

2 parents b5505ac + d9298f8 commit 3f7c4afCopy full SHA for 3f7c4af

64 files changed

+1598

-1025

lines changed

csv
- release-notes
  - CREDITS
  - VERSION
- src
  - main/java/com/fasterxml/jackson/dataformat/csv
  - test/java/com/fasterxml/jackson/dataformat/csv
properties
- release-notes
  - CREDITS
  - VERSION
- src
  - main/java/com/fasterxml/jackson/dataformat/javaprop
  - test/java/com/fasterxml/jackson/dataformat/javaprop
release-notes
yaml
- README.md
- release-notes
  - CREDITS
  - VERSION
- src
  - main/java/com/fasterxml/jackson/dataformat/yaml
  - test/java/com/fasterxml/jackson/dataformat/yaml

64 files changed

+1598

-1025

lines changed

`‎csv/release-notes/CREDITS`

This file was deleted.

`‎csv/release-notes/VERSION`

This file was deleted.

Comments

(0)