on xenial help sign in
fix bad merge
9d620baMichael Zanetti
tests/mocks/Utils/plugin.cpp−4
@@ -1,9 +1,5 @@
1/*
1/*
2−<<<<<<< TREE
3− * Copyright (C) 2012 Canonical, Ltd.
4−=======
5 * Copyright (C) 2015 Canonical, Ltd.
2 * Copyright (C) 2015 Canonical, Ltd.
6−>>>>>>> MERGE-SOURCE
7 *
3 *
8 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by