Return-Path: X-Original-To: apmail-incubator-flex-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-flex-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 873B89115 for ; Wed, 4 Jul 2012 02:17:13 +0000 (UTC) Received: (qmail 26139 invoked by uid 500); 4 Jul 2012 02:17:12 -0000 Delivered-To: apmail-incubator-flex-dev-archive@incubator.apache.org Received: (qmail 26096 invoked by uid 500); 4 Jul 2012 02:17:12 -0000 Mailing-List: contact flex-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: flex-dev@incubator.apache.org Delivered-To: mailing list flex-dev@incubator.apache.org Received: (qmail 26088 invoked by uid 99); 4 Jul 2012 02:17:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2012 02:17:12 +0000 X-ASF-Spam-Status: No, hits=2.2 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [209.85.214.47] (HELO mail-bk0-f47.google.com) (209.85.214.47) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2012 02:17:05 +0000 Received: by bkcik5 with SMTP id ik5so3008744bkc.6 for ; Tue, 03 Jul 2012 19:16:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-originating-ip:in-reply-to:references:date :message-id:subject:from:to:content-type:x-gm-message-state; bh=t1AIOW0bGP2JGAGN0OC3ToHxld3Oc9TOAkdq8+E9hGU=; b=E6m4S/EkOtnPwwWZI6h5dV0FmNsUVY8RXitS246bEfd1MVg2RrPIKcOW+DcRHsgv8/ dE3Gb6UDGZWu/wfeM7SqXJnH6k1rvUiTQCf4f6r3Rq3MAvfVdjwXd7iEPrZmiz/0/InF taWVnnVIl+0RSfR+4buSodzxwivJx7mZ6WAti5YUvql3rk6IsoCTacCyen8S3hDUp2y6 3h5MOcOu5cuGqBPNjuAmFHjegxKN61/ayM9BlvBqA7eljpt5ffLLinQiwAGbkhpH8uIF sKGFm59wddzG5FitxjwjNzB/s6kh3d0tLQcKlU3EVYeJfv0Y3A+Vvs/stHsxPniGX+Pt QayQ== MIME-Version: 1.0 Received: by 10.204.148.75 with SMTP id o11mr10772794bkv.11.1341368204086; Tue, 03 Jul 2012 19:16:44 -0700 (PDT) Received: by 10.204.201.140 with HTTP; Tue, 3 Jul 2012 19:16:44 -0700 (PDT) X-Originating-IP: [173.10.39.57] In-Reply-To: <8C134F28-7A58-4FAF-872F-28438E4B4A9E@classsoftware.com> References: <8C134F28-7A58-4FAF-872F-28438E4B4A9E@classsoftware.com> Date: Tue, 3 Jul 2012 22:16:44 -0400 Message-ID: Subject: Re: env-template.properties typos From: Nicholas Kwiatkowski To: flex-dev@incubator.apache.org Content-Type: multipart/alternative; boundary=0015175cfb4e514f1704c3f79f2b X-Gm-Message-State: ALoCoQmrQP1iZLJ0lpx+VFh7jUZ+1zteR7+KRSbFcVRVaN2RYHiU5uHfsbDsF3ownDI/kwM9fTzG --0015175cfb4e514f1704c3f79f2b Content-Type: text/plain; charset=ISO-8859-1 That's why I was getting a merge error! Thanks Justin! On Tue, Jul 3, 2012 at 7:26 PM, Justin Mclean wrote: > Hi, > > > env-template.properties includes: > > 0n Mac > > > > instead of: > > On Mac > > Not anymore I just fixed it. > > Thanks, > Justin > --0015175cfb4e514f1704c3f79f2b--