guolong
/
comflux-coin
0
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	contracts/ShuiJing.sol
master
long 2 years ago
parent
eeb0664344 38804a3fe1
commit
95fcff9877
2 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      README.md
  2. 0
      contracts/ShuiJing.sol

2
README.md
Unescape View File

@ -15,4 +15,4 @@ This is a sample project of [OpenZeppelin contracts](https://openzeppelin.com/co
npm install @openzeppelin/contracts
truffle-flattener contracts/GameItem.sol > GameItem.sol
truffle-flattener contracts/ShuiJing.sol > ShuiJing.sol

0
contracts/GameItem.sol → contracts/ShuiJing.sol
Unescape View File

Write Preview
Loading…
Cancel
Save