summaryrefslogtreecommitdiffstats
path: root/archive
diff options
context:
space:
mode:
authorVlad Glagolev2019-05-25 15:38:17 +0000
committerVlad Glagolev2019-05-25 15:38:17 +0000
commit020fd6ffdf3a229a5ef58c34c8a32046cfc2056c (patch)
tree02eaee313972f5ac1e620f8720a933f5432bf0c5 /archive
parent4e61d26f634dd5a9b0cebba6486b2b68f6372ba2 (diff)
rpm: correct HISTORY file
Diffstat (limited to 'archive')
-rw-r--r--archive/rpm/HISTORY1
1 files changed, 0 insertions, 1 deletions
diff --git a/archive/rpm/HISTORY b/archive/rpm/HISTORY
index 528fb9e2e6..f00f2d6740 100644
--- a/archive/rpm/HISTORY
+++ b/archive/rpm/HISTORY
@@ -90,7 +90,6 @@
* DETAILS, DEPENDS, PRE_BUILD: use gcc 3.4, bug #12754
* PRE_BUILD: fixed target dir in python Makefiles
->>>>>>> .merge_file_NXJa26
2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
* DETAILS: (automated) Add KEYWORDS