aboutsummaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1995-01-05 22:03:37 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1995-01-05 22:03:37 +0000
commit084d60b4a05fd3b1623a71280cc1e198f598506a (patch)
tree4692a895fdd8eeb634f522074ddada74f595c18a /lang
parentba7e3819b520388f112b39cf1552d21758fc14f4 (diff)
downloadports-084d60b4a05fd3b1623a71280cc1e198f598506a.tar.gz
ports-084d60b4a05fd3b1623a71280cc1e198f598506a.zip
Notes
Diffstat (limited to 'lang')
-rw-r--r--lang/Sather/distinfo4
1 files changed, 4 insertions, 0 deletions
diff --git a/lang/Sather/distinfo b/lang/Sather/distinfo
index b4bb808558d4..2ada1a814cb2 100644
--- a/lang/Sather/distinfo
+++ b/lang/Sather/distinfo
@@ -1 +1,5 @@
+<<<<<<< 1.2
+MD5 (Sather-1.0.2.tar.Z) = c14897455b555989ab812b0cb5c65ffd
+=======
MD5 (Sather-1.0.4.tar.Z) = 4cfe9df9a1dbf809129a9f63938292fb
+>>>>>>> /tmp/T4010836