diff options
Diffstat (limited to 'sources')
| -rw-r--r-- | sources | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -1,7 +1,2 @@ -<<<<<<< HEAD -e75c2944634f875a301d85ab30c2d094 opendkim-2.10.1.tar.gz -d5cc6208c52eb939b538290470c88fdb opendkim.init.patch -======= d5cc6208c52eb939b538290470c88fdb opendkim.init.patch e75c2944634f875a301d85ab30c2d094 opendkim-2.10.1.tar.gz ->>>>>>> origin/master |