1. shemnon
  2. ControlsFX

Commits

Jonathan Giles  committed 7af69c6

Merge

  • Participants
  • Parent commits 05ef87d
  • Branches default

Comments (0)

Files changed (1)

File build.gradle

View file
  • Ignore whitespace
     }
 }
 
-<<<<<<< local
 javadoc {
     exclude 'impl/*'
-=======
-dependencies {
-    try {
-        compile files(jfxrtJar)
-    } catch (MissingPropertyException pne) {
-        compile files("${System.properties['java.home']}/lib/ext/jfxrt.jar")
-    }
->>>>>>> other
 }
 
 task jarSamples (type: Jar) {