diff options
| author | Henrik Rydberg <rydberg@euromail.se> | 2008-11-16 00:14:59 +0100 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2008-11-16 00:14:59 +0100 |
| commit | 4ce9dec0eb6218a13f2343324d1a5a91128324aa (patch) | |
| tree | ccfea229a2166bf479ab89499fdf5b56ae3a96b9 /.bzr/checkout/conflicts | |
| parent | f5f45252298522f28c9013a4546eea70c9819b62 (diff) | |
mistakenly added the bzr tree
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to '.bzr/checkout/conflicts')
| -rw-r--r-- | .bzr/checkout/conflicts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.bzr/checkout/conflicts b/.bzr/checkout/conflicts deleted file mode 100644 index 0dc2d3a..0000000 --- a/.bzr/checkout/conflicts +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | BZR conflict list format 1 | ||