diff options
| author | Nino Miškić-Pletenac <nino.mip@gmail.com> | 2018-06-27 16:38:10 +0200 |
|---|---|---|
| committer | Nino Miškić-Pletenac <nino.mip@gmail.com> | 2018-06-27 16:38:10 +0200 |
| commit | 705ef3537e7e66d299b520b0430f36ffba33e6d1 (patch) | |
| tree | 1a9036722cd80bb23087bafd33ec1dfed60b3e1a /README.md | |
| parent | 35fa2e3b263a64063a42e279ed62c0190639b054 (diff) | |
Fix unresolved merge conflict in README.md
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -96,11 +96,7 @@ license. [mailing list]: https://lists.sourceforge.net/lists/listinfo/mixxx-devel [irc channel]: http://mixxx.org/irc.php [SCons]: http://www.scons.org/ -<<<<<<< HEAD [launchpad 2.2.0]: https://launchpad.net/mixxx/+milestone/2.2.0 -======= -[launchpad 2.1.1]: https://launchpad.net/mixxx/+milestone/2.1.1 ->>>>>>> upstream/2.1 [wiki roadmap]: http://mixxx.org/wiki/doku.php/development_roadmap [easybugs]: https://bugs.launchpad.net/mixxx/+bugs?field.searchtext=&orderby=-importance&search=Search&field.status%3Alist=NEW&field.status%3Alist=CONFIRMED&field.status%3Alist=TRIAGED&field.status%3Alist=INPROGRESS&field.status%3Alist=INCOMPLETE_WITH_RESPONSE&field.status%3Alist=INCOMPLETE_WITHOUT_RESPONSE&assignee_option=any&field.assignee=&field.bug_reporter=&field.bug_commenter=&field.subscriber=&field.structural_subscriber=&field.tag=easy&field.tags_combinator=ANY&field.has_cve.used=&field.omit_dupes.used=&field.omit_dupes=on&field.affects_me.used=&field.has_patch.used=&field.has_branches.used=&field.has_branches=on&field.has_no_branches.used=&field.has_no_branches=on&field.has_blueprints.used=&field.has_blueprints=on&field.has_no_blueprints.used=&field.has_no_blueprints=on [creating skins]: http://mixxx.org/wiki/doku.php/creating_skins |