# HG changeset patch # User Chris Cannam # Date 1592484718 -3600 # Node ID 19fc1dc0994f4e9da8a95ad8ba618f013a683fde # Parent ebb78549fe0246ba25526a43e24edf65bde10c72# Parent 70429077a6d0cb4af38dfe33d565b8082754a186 Merge from branch csv-import-headers diff -r 70429077a6d0 -r 19fc1dc0994f repoint-lock.json --- a/repoint-lock.json Thu Jun 18 11:56:37 2020 +0100 +++ b/repoint-lock.json Thu Jun 18 13:51:58 2020 +0100 @@ -4,10 +4,10 @@ "pin": "0e32c328b02a" }, "svcore": { - "pin": "566476eeeb80" + "pin": "48f50a4a82ea" }, "svgui": { - "pin": "129c704566ff" + "pin": "fe9a643b83bf" }, "svapp": { "pin": "7bded7599874" diff -r 70429077a6d0 -r 19fc1dc0994f repoint-project.json --- a/repoint-project.json Thu Jun 18 11:56:37 2020 +0100 +++ b/repoint-project.json Thu Jun 18 13:51:58 2020 +0100 @@ -16,13 +16,11 @@ }, "svcore": { "vcs": "hg", - "service": "soundsoftware", - "branch": "csv-import-headers" + "service": "soundsoftware" }, "svgui": { "vcs": "hg", - "service": "soundsoftware", - "branch": "csv-import-headers" + "service": "soundsoftware" }, "svapp": { "vcs": "hg",