BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-03 04:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some error

Browse Source
This commit is contained in:
吴凡
2016-07-01 11:17:03 +08:00
parent 70deb70b76
commit 5ea2b49f58
13 changed files with 1 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/generate_code.sh
View File

@@ -1,7 +1,3 @@
<<<<<<< HEAD
../flatc --cpp --java --csharp --go --binary --python --js --php --gen-mutable --no-includes monster_test.fbs monsterdata_test.json
../flatc --binary --schema monster_test.fbs
=======
#!/bin/bash
#
# Copyright 2015 Google Inc. All rights reserved.
@@ -22,4 +18,3 @@
../flatc --cpp --java --csharp --go --binary --python --js --php --gen-mutable -o namespace_test namespace_test/namespace_test1.fbs namespace_test/namespace_test2.fbs
../flatc --binary --schema monster_test.fbs
>>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70