| commit | b15c4c3a412286756eaf8e7f6ad6787d93556f96 | [log] [tgz] |
|---|---|---|
| author | Matteo Scandolo <teo@onlab.us> | Wed Mar 02 11:01:02 2016 -0800 |
| committer | Matteo Scandolo <teo@onlab.us> | Wed Mar 02 11:01:02 2016 -0800 |
| tree | 19a06f11b58d98bc23e8f7d7ad97f319f40349bc | |
| parent | 6c6e59418442215e12074d334f1f8a89d8dac688 [diff] | |
| parent | c17b280d460796edcf24bf9a2ebb87a4354653fe [diff] |
Resolved conflict in docker ingore
diff --git a/.dockerignore b/.dockerignore index 9afc36d..b298e66 100755 --- a/.dockerignore +++ b/.dockerignore
@@ -1,3 +1,3 @@ views/ applications/ -containers/ \ No newline at end of file +containers/