Skip to content

Commit b5aeb8a

Browse files
javieravilesjavieraviles
committed
f3: including 0.2.1 + adapting a conflicts
2 parents 6a4bbe2 + 70346e0 commit b5aeb8a

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

‎README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
# Code&Bricks E-commerce using git flow
22
## Changelog
33
### Release 0.1.0
4-
- New Feature 1
4+
- New Feature 1
5+
### Release 0.2.0
6+
- New Feature 2
7+
### Release 0.2.1
8+
- Fix for Feature 2 bug

‎a.code

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f1f3
1+
f2f1f3

‎d.code

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f2

‎f.code

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
hotfix0.2.1

0 commit comments

Comments
 (0)