From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <noreply@github.com>
Received: from smtp1-ext.rs.github.com (smtp1-ext.rs.github.com
	[207.97.227.250])
	by huchra.bufferbloat.net (Postfix) with ESMTP id 48774200CCC
	for <cerowrt-commits@bufferbloat.net>;
	Sat, 16 Jun 2012 17:17:48 -0700 (PDT)
Received: from github.com (sh3.rs.github.com [108.171.174.178])
	by smtp1-ext.rs.github.com (Postfix) with ESMTP id 17787427F6
	for <cerowrt-commits@bufferbloat.net>;
	Sat, 16 Jun 2012 17:17:47 -0700 (PDT)
Date: Sat, 16 Jun 2012 17:17:47 -0700
From: GitHub <noreply@github.com>
To: cerowrt-commits@bufferbloat.net
Message-ID: <4fdd222bab99_733f1918aec755a5@sh3.rs.github.com.mail>
Subject: [dtaht/Cerowrt-3.3] d287ab: [build]: fix merge conflict
Mime-Version: 1.0
Content-Type: multipart/mixed;
	boundary="--==_mimepart_4fdd222b73c5_733f1918aec75375";
	charset=UTF-8
Content-Transfer-Encoding: 7bit
X-BeenThere: cerowrt-commits@lists.bufferbloat.net
X-Mailman-Version: 2.1.13
Precedence: list
Reply-To: GitHub <noreply@github.com>
List-Id: Development commits for the cerowrt project
	<cerowrt-commits.lists.bufferbloat.net>
List-Unsubscribe: <https://lists.bufferbloat.net/options/cerowrt-commits>,
	<mailto:cerowrt-commits-request@lists.bufferbloat.net?subject=unsubscribe>
List-Archive: <https://lists.bufferbloat.net/pipermail/cerowrt-commits>
List-Post: <mailto:cerowrt-commits@lists.bufferbloat.net>
List-Help: <mailto:cerowrt-commits-request@lists.bufferbloat.net?subject=help>
List-Subscribe: <https://lists.bufferbloat.net/listinfo/cerowrt-commits>,
	<mailto:cerowrt-commits-request@lists.bufferbloat.net?subject=subscribe>
X-List-Received-Date: Sun, 17 Jun 2012 00:17:48 -0000



----==_mimepart_4fdd222b73c5_733f1918aec75375
Date: Sat, 16 Jun 2012 17:17:47 -0700
Mime-Version: 1.0
Content-Type: text/plain;
 charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-ID: <4fdd222b97f8_733f1918aec754ee@sh3.rs.github.com.mail>

  Branch: refs/heads/master
  Home:   https://github.com/dtaht/Cerowrt-3.3
  Commit: d287ab2befac8eac9de1a5a56e832c9fe4f586ec
      https://github.com/dtaht/Cerowrt-3.3/commit/d287ab2befac8eac9de1a5a56e832c9fe4f586ec
  Author: Stephen Walker <stephendwalker+github@gmail.com>
  Date:   2012-06-16 (Sat, 16 Jun 2012)

  Changed paths:
    M Config.in

  Log Message:
  -----------
  [build]: fix merge conflict




----==_mimepart_4fdd222b73c5_733f1918aec75375--