summaryrefslogtreecommitdiff
path: root/etc/.cfgl
diff options
context:
space:
mode:
Diffstat (limited to 'etc/.cfgl')
-rw-r--r--etc/.cfgl/config2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/.cfgl/config b/etc/.cfgl/config
index 608699e2..e7385c3d 100644
--- a/etc/.cfgl/config
+++ b/etc/.cfgl/config
@@ -13,4 +13,4 @@
gpgsign = false
[branch "ca"]
remote = origin
- merge = refs/heads/ca
+ merge = refs/heads/aa