Skip to content

Commit

Permalink
Merge branch 'id-hash' of github.com:riverford/objection
Browse files Browse the repository at this point in the history
� Conflicts:
�	CHANGELOG.md
�	README.md
�	project.clj
�	src/objection/core.cljc
�	src/objection/util.clj
  • Loading branch information
wotbrew committed Jul 12, 2021
2 parents 6e8a463 + 43a3065 commit 4b15018
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ All notable changes to this project will be documented in this file. This change
### Changed
- `defsingleton` now takes an (optional) options map with an optional `:reload?` flag.

## [0.1.2]

### Fixed
- identity-box not using system hash code

## [0.1.1]

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ One thing that is particularily nice about both integrant and component is the d

## Installation

`[riverford/objection "0.1.1"]`
`[riverford/objection "0.1.3"]`

## Usage

Expand Down
2 changes: 1 addition & 1 deletion project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject riverford/objection "0.1.2-SNAPSHOT"
(defproject riverford/objection "0.1.4-SNAPSHOT"
:description "Manages global resources."
:url "https://github.com/riverford/objection"
:license {:name "Eclipse Public License"
Expand Down

0 comments on commit 4b15018

Please sign in to comment.