diff options
| author | Your Name <you@example.com> | 2013-03-15 06:02:25 -0400 |
|---|---|---|
| committer | Your Name <you@example.com> | 2013-03-15 06:02:25 -0400 |
| commit | e1047af73a37bcb0a2395ab00e06997eb6a7b61a (patch) | |
| tree | 7941af9029ea8eb0435f5cd4a97dff51cb062b0e /minikrebs/profiles/instakrebs/customfiles/etc/config/tinc | |
| parent | d3e60d8fac6315692f64d52f1eec55511341e7cf (diff) | |
| parent | 001bfd5f2b6890cafd209de4ea360927d4dd8a55 (diff) | |
Merge branch 'master' of https://github.com/krebscode/painload
Conflicts:
minikrebs
Diffstat (limited to 'minikrebs/profiles/instakrebs/customfiles/etc/config/tinc')
| -rw-r--r-- | minikrebs/profiles/instakrebs/customfiles/etc/config/tinc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/minikrebs/profiles/instakrebs/customfiles/etc/config/tinc b/minikrebs/profiles/instakrebs/customfiles/etc/config/tinc deleted file mode 100644 index 3a03196c..00000000 --- a/minikrebs/profiles/instakrebs/customfiles/etc/config/tinc +++ /dev/null @@ -1,2 +0,0 @@ -config tinc-net retiolum - option enabled 1 |