annotate profiles/repo_name @ 437:061dcecdcd1e

resolved merge conflict
author Dirk Olmes <dirk@xanthippe.ping.de>
date Mon, 20 Mar 2017 07:20:37 +0100
parents 1d5589cb15a6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
213
1d5589cb15a6 change repo name
holger
parents: 44
diff changeset
1 local