pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-11 16:11:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
David Tolnay
2017-04-17 14:19:32 -07:00
parent a778425d0f
commit 6279b0d930
6 changed files with 54 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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"