| commit | 8bf72d0950537df7a1e0ecd3c29f2db24f4a903c | [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 | a0995ae753b45766e80170e72181a7652b6f575e | |
| parent | 5fc82c33d318e447b18b86e1ddcf65d782bc2e71 [diff] | |
| parent | 488e038ca0d30919f8499de0942a9fed8283cf9c [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/