summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorMichal Krol <michal@vmware.com>2009-12-12 16:49:26 +0100
committerMichal Krol <michal@vmware.com>2009-12-12 16:49:26 +0100
commita3b32934c83f721102b9dd004227a528a174d7bb (patch)
tree7c0068148faf52100f6bc82547849f3b3ee72d6a /progs
parenta3eb0f718e19653a2ad8e49396c904183be456f3 (diff)
slang: Delete a file that is now autogenerated.
This file has been modified in master and removed in feature branch. This gave a merge conflict I couldn't resolve by removing and git adding it to index.
Diffstat (limited to 'progs')
0 files changed, 0 insertions, 0 deletions