From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3e11f8257dfe003aaad20d7ca73e3bc831131a96
Date: Thu, 11 Apr 2019 06:36:00 +0100 [thread overview]
Message-ID: <20190411053600.72B5584FDB0@people01.i.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1410 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 3e11f8257dfe003aaad20d7ca73e3bc831131a96 (commit)
from d27675b08175ed7969d842fdc64f157797911faa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3e11f8257dfe003aaad20d7ca73e3bc831131a96
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Apr 11 07:34:14 2019 +0200
make.sh: fix syntax error
i have merged master>next and not deleted this line.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
make.sh | 1 -
1 file changed, 1 deletion(-)
Difference in files:
diff --git a/make.sh b/make.sh
index b4d5ea7a3..d015dd95a 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,6 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
-<<<<<<< HEAD
VERSION="2.23" # Version number
CORE="131" # Core Level (Filename)
PAKFIRE_CORE="130" # Core Level (PAKFIRE)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2019-04-11 5:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190411053600.72B5584FDB0@people01.i.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox