summaryrefslogtreecommitdiff
path: root/app/roles/git_merge.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/roles/git_merge.rb')
-rw-r--r--app/roles/git_merge.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/roles/git_merge.rb b/app/roles/git_merge.rb
new file mode 100644
index 00000000000..95e5942fb00
--- /dev/null
+++ b/app/roles/git_merge.rb
@@ -0,0 +1,2 @@
+module GitMerge
+end