diff options
| author | Thomas Schmid <schmid-thomas@gmx.net> | 2012-12-16 17:30:12 +0400 |
|---|---|---|
| committer | Thomas Schmid <schmid-thomas@gmx.net> | 2012-12-16 17:30:12 +0400 |
| commit | e0ded0db9d0d1ba35790c763d069302cb3766a6a (patch) | |
| tree | e8c3fbdf44df313595821a8c1f6b926e840ea2b8 /CONTRIBUTORS.md | |
| parent | b93500c912add807018329de5a862eac3d2d3093 (diff) | |
fixed failed merge
Diffstat (limited to 'CONTRIBUTORS.md')
| -rw-r--r-- | CONTRIBUTORS.md | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 4a78582a..ad4f5bdb 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -14,10 +14,6 @@ Chris J Kottaridis, Robert Fantini, Antonino Balsamo, Christopher Davies, Thomas Borrmann, Johannes Maybaum
## Resources
-[mozdev](http://www.mozdev.org), [SourceForge](http://sf.net),
-<<<<<<< HEAD +[mozdev](http://www.mozdev.org), [SourceForge](http://sf.net), [github](http://www.github.com), [crowdin](http://crowdin.net),
-======= -[github](http://www.github.net), [crowdin](http://crowdin.net),
->>>>>>> branch 'master' of https://github.com/thsmi/sieve.git [jQuery](http://www.jquery.com), [CodeMirror](http://www.codemirror.net)
|