summaryrefslogtreecommitdiffstatshomepage
path: root/hash/ekara_us.xml
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /hash/ekara_us.xml
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'hash/ekara_us.xml')
-rw-r--r--hash/ekara_us.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/hash/ekara_us.xml b/hash/ekara_us.xml
index 69af8ccac8d..e16a244b617 100644
--- a/hash/ekara_us.xml
+++ b/hash/ekara_us.xml
@@ -229,5 +229,5 @@
</dataarea>
</part>
</software>
-
+
</softwarelist>