pezkuwichain/serde
1
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-10-27 13:59:53 +00:00
Code Releases Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
David Tolnay committed 2017-04-17 14:25:29 -07:00
1 parent a778425d0f
commit 6279b0d930
6 files changed
+54 -147
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

serde_test/Cargo.toml
+1 -7
View File
@@ -1,12 +1,6 @@
[package]
name = "serde_test"
<<<<<<< HEAD
version = "0.9.13" # remember to update html_root_url
||||||| merged common ancestors
version = "0.9.13"
=======
version = "0.9.14"
>>>>>>> origin/master
version = "0.9.14" # remember to update html_root_url
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "Token De/Serializer for testing De/Serialize implementations"