summaryrefslogtreecommitdiffstatshomepage
path: root/hash/timex_dock.xml
diff options
context:
space:
mode:
authorGravatarGravatar andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committerGravatarGravatar andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /hash/timex_dock.xml
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'hash/timex_dock.xml')
-rwxr-xr-x[-rw-r--r--]hash/timex_dock.xml0
1 files changed, 0 insertions, 0 deletions
diff --git a/hash/timex_dock.xml b/hash/timex_dock.xml
index 08d5b11a705..08d5b11a705 100644..100755
--- a/hash/timex_dock.xml
+++ b/hash/timex_dock.xml