Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

merge from upstream

  • Loading branch information...
commit b3d556372b2054aa3535af90d58bdd426ac8d269 2 parents 24a7834 + 6e51fba
Sidney Maestre SidneyAllen authored
2  clojure/pom.xml
@@ -29,7 +29,7 @@
29 29 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30 30 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
31 31 <clojure.version>1.3.0</clojure.version>
32   - <customcode.version>0.4.0</customcode.version>
  32 + <customcode.version>0.4.4</customcode.version>
33 33 </properties>
34 34
35 35 <dependencies>
6 java/pom.xml
@@ -26,9 +26,15 @@
26 26 <version>0.1.0-SNAPSHOT</version>
27 27
28 28 <properties>
  29 +<<<<<<< HEAD
29 30 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30 31 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
31 32 <customcode.version>0.4.4</customcode.version>
  33 +=======
  34 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  35 + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
  36 + <customcode.version>0.4.4</customcode.version>
  37 +>>>>>>> upstream/master
32 38 </properties>
33 39
34 40 <pluginRepositories>
2  scala-maven/pom.xml
@@ -28,7 +28,7 @@
28 28 <properties>
29 29 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30 30 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
31   - <customcode.version>0.4.0</customcode.version>
  31 + <customcode.version>0.4.4</customcode.version>
32 32 <scala.version>2.9.1</scala.version>
33 33 </properties>
34 34
2  scala-sbt/build.sbt
@@ -7,7 +7,7 @@ version := "0.1.0-SNAPSHOT"
7 7 scalaVersion := "2.9.1"
8 8
9 9 libraryDependencies ++= {
10   - val ccVersion = "0.4.0"
  10 + val ccVersion = "0.4.4"
11 11 Seq(
12 12 "com.stackmob" % "customcode" % ccVersion % "provided" withSources()
13 13 )

0 comments on commit b3d5563

Please sign in to comment.
Something went wrong with that request. Please try again.