[netdisco/el6] Update to version 1.1
gouldwp
gouldwp at fedoraproject.org
Wed Oct 19 18:43:51 UTC 2011
commit 15cfd4ccd888b60c802a464cc7cb4aee477ae04b
Author: Walter Gould <gouldwp at fedoraproject.org>
Date: Sun Oct 16 15:51:33 2011 -0500
Update to version 1.1
sources | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/sources b/sources
index ab3acbc..0593fc7 100644
--- a/sources
+++ b/sources
@@ -1,8 +1 @@
-<<<<<<< HEAD
-bbb9cd2dbf487a3c106456eb67a10b6a netdisco-1.0.tar.gz
-8b90b508efd76f206739dc82c3c4601e INSTALL.fedora
-8b90b508efd76f206739dc82c3c4601e INSTALL.rhel
-35b656bdb8506f0b413c4abab44523e6 netdisco-mibs-0.7.tar.gz
-=======
4f2d655d5520a2006b8b20a2837d66c9 netdisco-1.1_with_mibs.tar.gz
->>>>>>> master
More information about the scm-commits
mailing list