fix bad merge
commit9d620baec60a6cf5d6c44f3c877d671bbbdaf594
authorMichael Zanetti <michael.zanetti@canonical.com>
dateMon 6 Jul 2015, 16:30 (11 years ago)
parent79b70fb
tests/mocks/Utils/plugin.cpp−4
@@ -1,9 +1,5 @@
11/*
2−<<<<<<< TREE
3− * Copyright (C) 2012 Canonical, Ltd.
4−=======
52 * Copyright (C) 2015 Canonical, Ltd.
6−>>>>>>> MERGE-SOURCE
73 *
84 * This program is free software; you can redistribute it and/or modify
95 * it under the terms of the GNU General Public License as published by