diff options
Diffstat (limited to 'calendar/gui/e-cal-component-preview.c')
| -rw-r--r-- | calendar/gui/e-cal-component-preview.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c index d75f06c41e..9264d449f1 100644 --- a/calendar/gui/e-cal-component-preview.c +++ b/calendar/gui/e-cal-component-preview.c @@ -8,11 +8,19 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. +<<<<<<< HEAD:calendar/gui/e-cal-component-preview.c * * You should have received a copy of the GNU Lesser General Public * License along with the program; if not, see <http://www.gnu.org/licenses/> * * +======= + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> + * + * +>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:calendar/gui/e-cal-component-preview.c * Authors: * Federico Mena Quintero <federico@ximian.com> * Damon Chaplin <damon@ximian.com> |