diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-02-14 17:18:59 -0600 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-02-14 17:18:59 -0600 |
| commit | 9d1bdde7efc7b8cb6aa8db6a86777393e838fe8e (patch) | |
| tree | 487b8c5ad9b654d6e1795dd72ef8e90f17663de4 /krm_mapping.json.sample | |
| parent | ee4cba7779daa5b2e7415fb69cabc698b7dd60da (diff) | |
| parent | 799f5222e5eea2825f1e05a66e44eb4df709234e (diff) | |
fixed merge conflict
Diffstat (limited to 'krm_mapping.json.sample')
| -rw-r--r-- | krm_mapping.json.sample | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/krm_mapping.json.sample b/krm_mapping.json.sample deleted file mode 100644 index 1ecfba635..000000000 --- a/krm_mapping.json.sample +++ /dev/null @@ -1,3 +0,0 @@ -{ - "machine" : ["kernel", "ramdisk"] -} |