diff --git a/config.txt b/config.txt new file mode 100644 index 00000000..978751ce --- /dev/null +++ b/config.txt @@ -0,0 +1,3 @@ +Some cnfigsettings in remote +And a new feature from local +Another option \ No newline at end of file diff --git a/feature3/feature3.txt b/feature3/feature3.txt new file mode 100644 index 00000000..75eae95c --- /dev/null +++ b/feature3/feature3.txt @@ -0,0 +1 @@ +A feature 3 file diff --git a/feature4/feature4.txt b/feature4/feature4.txt new file mode 100644 index 00000000..13a3adda --- /dev/null +++ b/feature4/feature4.txt @@ -0,0 +1 @@ +A new feature \ No newline at end of file diff --git a/utility/config.txt b/utility/config.txt new file mode 100644 index 00000000..ef34d7b2 --- /dev/null +++ b/utility/config.txt @@ -0,0 +1,3 @@ +config setting 1 +config setting 2 +config setting 3 diff --git a/utility/feature.txt b/utility/feature.txt new file mode 100644 index 00000000..78f7a8c9 --- /dev/null +++ b/utility/feature.txt @@ -0,0 +1,2 @@ +feature 1 +featire 2 \ No newline at end of file diff --git a/utility/utility.txt b/utility/utility.txt new file mode 100644 index 00000000..c4eca98e --- /dev/null +++ b/utility/utility.txt @@ -0,0 +1,3 @@ +util1 +util2 +util 3 \ No newline at end of file