diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-17 03:09:07 -0400 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-17 03:09:07 -0400 |
commit | ebf93c0807053bf2408456e893e5e26afd805f0e (patch) | |
tree | 8018dfd7c5dbaf848cf6d5ac9a33688f527b8526 /.gitignore | |
parent | b9c20082bcbd231eb67c3ded0d3fe6674c8c55b7 (diff) | |
download | cbt-ebf93c0807053bf2408456e893e5e26afd805f0e.tar.gz cbt-ebf93c0807053bf2408456e893e5e26afd805f0e.tar.bz2 cbt-ebf93c0807053bf2408456e893e5e26afd805f0e.zip |
Replace dependencies feature for conflict resolution
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -16,3 +16,4 @@ examples/dotty-example/_site examples/scalajs-plain-example/server/public/generated examples/scalajs-react-example/server/public/generated .cbt-loop.tmp +test/simple/src_generated |