summaryrefslogtreecommitdiff
path: root/libre/linux-libre/linux-libre.install
diff options
context:
space:
mode:
Diffstat (limited to 'libre/linux-libre/linux-libre.install')
-rw-r--r--libre/linux-libre/linux-libre.install4
1 files changed, 4 insertions, 0 deletions
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index badaceefd..bab05ffce 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,11 @@
# arg 2: the old package version
KERNEL_NAME=
+<<<<<<< HEAD
KERNEL_VERSION=3.1.6-1-LIBRE
+=======
+KERNEL_VERSION=3.2.0-1-LIBRE
+>>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c
post_install () {
# updating module dependencies