Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: webjars/blockly
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: CMCRobotics/blockly
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Aug 5, 2017

  1. Merge pull request #2 from webjars/master 

    upstream merge
    @bcopy
    bcopy authored Aug 5, 2017
    Copy the full SHA
    3cbd1b7 View commit details

  2. updated to upstream commit fdb2698d000

    @bcopy
    bcopy committed Aug 5, 2017
    Copy the full SHA
    67a35e4 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pom.xml
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -39,8 +39,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<upstream.version>36eb0787cc5</upstream.version>
<upstream.commit>36eb0787cc5dca38f54f10480c5b9efd1ab83229</upstream.commit>
<upstream.version>fdb2698d000</upstream.version>
<upstream.commit>fdb2698d0001c31e8834ee9cff53a0042f8bbcfa</upstream.commit>
<upstream.url>https://codeload.github.com/google/blockly/zip/${upstream.commit}</upstream.url>
<destDir>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}</destDir>
</properties>