diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 22:44:58 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 22:44:58 +0100 |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /hash/ekara_us.xml | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'hash/ekara_us.xml')
-rw-r--r-- | hash/ekara_us.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hash/ekara_us.xml b/hash/ekara_us.xml index e16a244b617..69af8ccac8d 100644 --- a/hash/ekara_us.xml +++ b/hash/ekara_us.xml @@ -229,5 +229,5 @@ </dataarea> </part> </software> - + </softwarelist> |