summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoredwardcwang2019-03-15 16:03:11 -0700
committerGitHub2019-03-15 16:03:11 -0700
commitd3280685892bbf0fd9b3c0f3d9e6750a30d25593 (patch)
tree08bf92d133f5e05e155878fcbd64e41cee892a6d
parent5d3e92ae2240a1aeb10df934c3a76e7404dbf835 (diff)
parentab68f5d76f645b721614f0efa8d55ab7d1e08a3d (diff)
Merge branch 'master' into popcount
-rw-r--r--doc/style.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/style.md b/doc/style.md
index 2e36e841..c845f7b4 100644
--- a/doc/style.md
+++ b/doc/style.md
@@ -1,7 +1,7 @@
# Chisel Style Guide
The Chisel style guide reflects the [Google Java style
-guide](http://https://google.github.io/styleguide/javaguide.html) and the [General Public Scala style
+guide](http://google.github.io/styleguide/javaguide.html) and the [General Public Scala style
guide](http://docs.scala-lang.org/style/). Specific rules below are to clarify
the style used for the chisel3 repo and repos related to Chisel (Firrtl).