Merge remote-tracking branch 'remotes/origin2/master'

[gitweb.git] / git_graph.php

diff --git a/git_graph.php b/git_graph.php
index 42f4813d263160db5fa4cacd9fe58673627928c6..5f660a02d38f72942eb36cc4fcd3202c556bb65a 100644 (file)
--- a/git_graph.php
+++ b/git_graph.php
@@ -1,8 +1,13 @@
 <?php
 
 /* CONFIG */
+<<<<<<< HEAD
+$repo_path = "/home/git/";
+$project_list = null;
+=======
 $repo_path = "/srv/gitosis/repositories/";
 $project_list = "/srv/gitosis/gitosis/projects.list";
+>>>>>>> remotes/origin2/master
 
 $size = 20;
 $header_height = false; //false = dynamic