jplesnik pushed to perl-CGI (f22). "4.15 bump; Package examples directory as documentation"

[notifications at fedoraproject.org]

>From aca5f27625d0a6f93ff310511dc3906104526ab2 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik at redhat.com>
Date: Mon, 20 Apr 2015 16:00:13 +0200
Subject: 4.15 bump; Package examples directory as documentation


diff --git a/.gitignore b/.gitignore
index 4cb2851..49cd8bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,8 +12,5 @@
 /CGI.pm-4.03.tar.gz
 /CGI-4.04.tar.gz
 /CGI-4.13.tar.gz
-<<<<<<< HEAD
-=======
 /CGI-4.14.tar.gz
 /CGI-4.15.tar.gz
->>>>>>> 485929a... 4.15 bump; Package examples directory as documentation
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl-CGI.git/commit/?h=f22&id=aca5f27625d0a6f93ff310511dc3906104526ab2