From 084d60b4a05fd3b1623a71280cc1e198f598506a Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Thu, 5 Jan 1995 22:03:37 +0000
Subject: Bring in the new sather file.

---
 lang/Sather/distinfo | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lang/Sather')

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
-- 
cgit v1.2.3