diff options
| author | MaZderMind <git@mazdermind.de> | 2016-09-29 11:48:01 +0200 |
|---|---|---|
| committer | MaZderMind <git@mazdermind.de> | 2016-09-29 11:48:01 +0200 |
| commit | 39d4864e6e67d6f1afde324dcbbaa9ef713c0f32 (patch) | |
| tree | 1d044b838c023770e23f87bba9850bb35acc9409 | |
| parent | 12ffd2155cbec3d94e8fc2df32532de016005a5c (diff) | |
| parent | 7334567da3f1c70289323e02f62634f72667c7e4 (diff) | |
Merge branch 'h01ger-master'
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | example-scripts/.gitignore | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -47,4 +47,8 @@ target/ *.mkv *.mp4 +#editor backups *~ + +# this ain't an example anymore: +example-scripts/config.sh diff --git a/example-scripts/.gitignore b/example-scripts/.gitignore deleted file mode 100644 index 003b199..0000000 --- a/example-scripts/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/config.sh - |