diff options
author | root | 2006-04-24 09:03:08 -0500 |
---|---|---|
committer | root | 2006-04-24 09:03:08 -0500 |
commit | 84d8b510ac289af0a43bfa9e110844af27a90196 (patch) | |
tree | d7093929b954dd2f71114bff270755e18f737eb1 /utils/console-data/CONFLICTS |
initial commit from stable 0.3
Diffstat (limited to 'utils/console-data/CONFLICTS')
-rwxr-xr-x | utils/console-data/CONFLICTS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/utils/console-data/CONFLICTS b/utils/console-data/CONFLICTS new file mode 100755 index 0000000000..310d109397 --- /dev/null +++ b/utils/console-data/CONFLICTS @@ -0,0 +1 @@ +conflicts kbd |