diff options
| author | Rich Hickey <richhickey@gmail.com> | 2010-08-22 14:12:05 -0400 |
|---|---|---|
| committer | Rich Hickey <richhickey@gmail.com> | 2010-08-22 14:12:05 -0400 |
| commit | c6fddcabebd1dec50ea535d7576615da57fc0112 (patch) | |
| tree | e197a4af918f6b6150337fcdea0c2805c190f350 /clojure.iml | |
| parent | 07f05862c2362f6b51e7c92ccd9476c45c9dff6e (diff) | |
| parent | 77be185a6ca00a338a6647462e14206bad0e9802 (diff) | |
Merged branch 'master' into equivmerge
Conflicts were:
src/clj/clojure/core.clj
src/jvm/clojure/lang/Compiler.java
src/jvm/clojure/lang/Util.java
test/clojure/test_clojure/protocols.clj
Diffstat (limited to 'clojure.iml')
| -rw-r--r-- | clojure.iml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/clojure.iml b/clojure.iml index 83686b75..183e1ddd 100644 --- a/clojure.iml +++ b/clojure.iml @@ -36,9 +36,5 @@ </library> </orderEntry> </component> - <component name="VcsManagerConfiguration"> - <option name="ACTIVE_VCS_NAME" value="svn" /> - <option name="USE_PROJECT_VCS" value="false" /> - </component> </module> |