Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merging with general haskell package

  • Loading branch information...
commit 77c997f99e1e2de8951ae3f9ed31a3dd8364f532 2 parents ee39c1a + bb422b5
@tonymorris authored
Showing with 4 additions and 7 deletions.
  1. +1 −0  .gitignore
  2. +2 −2 FilePather.lkshw
  3. +1 −5 LICENSE
View
1  .gitignore
@@ -1,2 +1,3 @@
dist
+.hpc
*.lkshs
View
4 FilePather.lkshw
@@ -1,10 +1,10 @@
Version of workspace file format:
1
Time of storage:
- "Tue Nov 16 09:59:22 EST 2010"
+ "Mon Jan 10 08:54:11 EST 2012"
Name of the workspace:
"FilePather"
File paths of contained packages:
["FilePather.cabal"]
Maybe file path of an active package:
- Just "FilePather.cabal"
+ Just "FilePather.cabal"
View
6 LICENSE
@@ -1,4 +1,4 @@
-Copyright 2011 Tony Morris
+Copyright 2012 Tony Morris
All rights reserved.
@@ -24,8 +24,4 @@ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-<<<<<<< HEAD
SUCH DAMAGE.
-=======
-SUCH DAMAGE.
->>>>>>> upstream/master
Please sign in to comment.
Something went wrong with that request. Please try again.