aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/e-cal-component-preview.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-05-17 00:11:55 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-05-21 10:52:36 +0800
commita538f3f3100dbdbae1ea172ae3b8344e650d529d (patch)
treef1f8b15c56dbe92e46352853373382af9bf92de0 /calendar/gui/e-cal-component-preview.c
parentd8fd55f9ec0e70a0d5c8529ea989f8c272d0c443 (diff)
downloadgsoc2013-evolution-a538f3f3100dbdbae1ea172ae3b8344e650d529d.tar
gsoc2013-evolution-a538f3f3100dbdbae1ea172ae3b8344e650d529d.tar.gz
gsoc2013-evolution-a538f3f3100dbdbae1ea172ae3b8344e650d529d.tar.bz2
gsoc2013-evolution-a538f3f3100dbdbae1ea172ae3b8344e650d529d.tar.lz
gsoc2013-evolution-a538f3f3100dbdbae1ea172ae3b8344e650d529d.tar.xz
gsoc2013-evolution-a538f3f3100dbdbae1ea172ae3b8344e650d529d.tar.zst
gsoc2013-evolution-a538f3f3100dbdbae1ea172ae3b8344e650d529d.zip
Fix several types of pedantic compiler warnings.
Diffstat (limited to 'calendar/gui/e-cal-component-preview.c')
-rw-r--r--calendar/gui/e-cal-component-preview.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index 01c01be6f9..dec1150ad1 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -8,19 +8,11 @@
* 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>