| commit | ffd1c54fdfc195209848dec95ea192c42ed21273 | [log] [tgz] |
|---|---|---|
| author | KIRAN KASHALKAR <kiran.kashalkar@riftio.com> | Wed Dec 07 09:28:13 2016 -0500 |
| committer | KIRAN KASHALKAR <kiran.kashalkar@riftio.com> | Mon Jan 09 11:48:27 2017 -0500 |
| tree | 7adae61b522fe41c80a7d703dba3fa949caaa9ed | |
| parent | 0a464389eabb51c9502a112e03b09a53a55b85c9 [diff] [blame] |
Bad merge fix Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
diff --git a/skyquake/.gitignore b/skyquake/.gitignore index 111d0cd..07b0361 100644 --- a/skyquake/.gitignore +++ b/skyquake/.gitignore
@@ -3,3 +3,5 @@ node_modules public dist +yarn.lock +upload/