diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2010-12-23 21:53:33 +0000 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2010-12-23 21:53:33 +0000 |
| commit | 5f8d02b39fb8917b34b68bbbf450656e1b68211c (patch) | |
| tree | 4a8489e10fecea511e3fffece42de81c9fdc7837 /CA/projects | |
| parent | 1c26d2b2ce824dbc64525eea699efbfa8bf04617 (diff) | |
| parent | 75e2cbec9eb5132a49446f1b6d563d5f43d007de (diff) | |
| download | nova-5f8d02b39fb8917b34b68bbbf450656e1b68211c.tar.gz nova-5f8d02b39fb8917b34b68bbbf450656e1b68211c.tar.xz nova-5f8d02b39fb8917b34b68bbbf450656e1b68211c.zip | |
fixed merge conflict
Diffstat (limited to 'CA/projects')
| -rw-r--r-- | CA/projects/.gitignore | 1 | ||||
| -rw-r--r-- | CA/projects/.placeholder | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/CA/projects/.gitignore b/CA/projects/.gitignore new file mode 100644 index 000000000..72e8ffc0d --- /dev/null +++ b/CA/projects/.gitignore @@ -0,0 +1 @@ +* diff --git a/CA/projects/.placeholder b/CA/projects/.placeholder new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/CA/projects/.placeholder |