From ce0bef53320a0975623d773042b52c3660b38920 Mon Sep 17 00:00:00 2001
From: Bradford Zhang <zyc@zyc.name>
Date: Fri, 5 Apr 2024 14:57:20 +0800
Subject: [PATCH] bird2: bump to version 2.15.1

Signed-off-by: Bradford Zhang <zyc@zyc.name>
(cherry picked from commit a55a0d13f7ec0e79f9340d90d74ed312ff6c26ce)
---
 bird2/Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bird2/Makefile b/bird2/Makefile
index 9fd0031da..85b74245c 100644
--- a/bird2/Makefile
+++ b/bird2/Makefile
@@ -7,12 +7,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bird2
+<<<<<<< HEAD
 PKG_VERSION:=2.13.1
+=======
+PKG_VERSION:=2.15.1
+>>>>>>> a55a0d1 (bird2: bump to version 2.15.1)
 PKG_RELEASE:=1
 
 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
+<<<<<<< HEAD
 PKG_HASH:=97bb8d57be9bc5083e2b566416d27e314162856a12ca7c77e202e467d20d4080
+=======
+PKG_HASH:=48e85c622de164756c132ea77ad1a8a95cc9fd0137ffd0d882746589ce75c75d
+>>>>>>> a55a0d1 (bird2: bump to version 2.15.1)
 
 PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
 PKG_LICENSE:=GPL-2.0-or-later