aboutsummaryrefslogtreecommitdiff
path: root/sam/errors/conflict.in
diff options
context:
space:
mode:
Diffstat (limited to 'sam/errors/conflict.in')
-rw-r--r--sam/errors/conflict.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/sam/errors/conflict.in b/sam/errors/conflict.in
new file mode 100644
index 0000000..980a0d5
--- /dev/null
+++ b/sam/errors/conflict.in
@@ -0,0 +1 @@
+Hello World!