diff options
| author | Allan Wang <me@allanwang.ca> | 2017-07-04 11:13:47 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-07-04 11:13:47 -0700 |
| commit | 4cf368be0cd2f179485b05a3d2cd9b7bc236ba8e (patch) | |
| tree | dec58af06d220ba80920fcf9c816b71413c61108 /.gitignore | |
| parent | 43885c6c063a76738ed7220aba619e47db7c4080 (diff) | |
| parent | d6c5bcd56e293eaf281663b6c1e6b0ab7236be9f (diff) | |
| download | frost-4cf368be0cd2f179485b05a3d2cd9b7bc236ba8e.tar.gz frost-4cf368be0cd2f179485b05a3d2cd9b7bc236ba8e.tar.bz2 frost-4cf368be0cd2f179485b05a3d2cd9b7bc236ba8e.zip | |
Fix merge
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -12,4 +12,5 @@ files/gplay-keys.json files/play.keystore files/play.properties -files/test.keystore
\ No newline at end of file +files/test.keystore +files/update-dev.sh |