resolve conflict

portagenetwork · Apr 5, 2022 · e0cdddc · e0cdddc
2 parents e1c607e + 1daf528
commit e0cdddc
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,16 +1,19 @@
 # Changelog
 
 ## [3.0.4+portage-3.0.7] - 2022-04-05
+
 ### Added
 
 - Added feature flag for sandbox testing [#159](https://github.com/portagenetwork/roadmap/issues/159)
-- Adjusted seed files for different environment and added seed files for sandbox testing
+- Adjust seed files for different environment and prepare seed files for sandbox testing
 
-### Fixed 
+### Fixed
 
 - Change plan identifier field and add it to export [#158](https://github.com/portagenetwork/roadmap/issues/158)
 - Change contact email to support@portagenetwork.ca [#172](https://github.com/portagenetwork/roadmap/issues/172)
+
 ## [3.0.4+portage-3.0.6] - 2022-03-23
+
 ### Fixed
    - Usage statistics page now shows correct data [#164](https://github.com/portagenetwork/roadmap/issues/164)
 
@@ -267,4 +270,3 @@
  - Fix name of downloaded usage file
  - Allow organizational admin to see the download button in 'Statisctics on Users' and 'Statistics on Tempalte' accordions
  - Upgrade node-sass to 7, node to 12 and adjust eslint test to use Github default action
-