diff options
| author | Marek Safar <marek.safar@gmail.com> | 2013-06-07 12:16:01 +0400 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2013-06-07 12:16:01 +0400 |
| commit | 19e095b1103891462343565aff9b187f88bf3947 (patch) | |
| tree | 646e7ff68ff52281ac6295efc0bfa5182905a2b6 | |
| parent | ee8c91a062c60e9a22d357232dafc12b9fe673df (diff) | |
| parent | fc755b42693b7cb282590347b340e91a601df883 (diff) | |
Merge pull request #33 from spicypixel/hotfix/webdoc-conflict-fix
[webdoc] Remove a merge conflict artifact breaking the install
| -rw-r--r-- | webdoc/plugins.def | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/webdoc/plugins.def b/webdoc/plugins.def index f4c60a1c..43861fd2 100644 --- a/webdoc/plugins.def +++ b/webdoc/plugins.def @@ -1,5 +1,4 @@ #####SKIN (pick ONE)##### -<<<<<<< HEAD #skins/xamarin-external #skins/mono-external #skins/xamarin-new |