Merge branch 'main' of https://github.com/data-centt/percentify

Author: Daniel15568

README.md

@@ -5,7 +5,7 @@
 [![License](https://img.shields.io/pypi/l/percentify.svg?style=flat&color=orange)](LICENSE)
 [![Build Status](https://github.com/data-centt/percentify/actions/workflows/python-app.yml/badge.svg)](https://github.com/data-centt/percentify/actions/workflows/python-app.yml)
 
-**Percentify** — a tiny Python helper that turns *"part of a whole"* into a clean percentage.  
+**Percentify** is a Python helper that turns *"part of a whole"* into a clean percentage.  
 Stop typing `(part / whole) * 100` and worrying about division by zero.
 
 ---
@@ -14,13 +14,20 @@ Stop typing `(part / whole) * 100` and worrying about division by zero.
 
 A tiny, zero-dependency Python toolkit for all things percentages:
 
+<<<<<<< HEAD
 - **`percent`** — what percentage is `part` of `whole`?
 - **`percent_change`** — how much did a value increase or decrease?
 - **`percent_diff`** — how far apart are two values?
 - **`percent_distribute`** — split a total into weighted shares.
 - **`percent_format`** — turn any number into a clean `"25.0%"` string.
 
 All functions handle edge cases (division by zero, negative values) safely and let you control decimal precision.
+=======
+- Calculates what percentage one number is of another.
+- Handles divide-by-zero safely (returns 0.0 instead of crashing).
+- Lets you choose how many decimal places you want to round your answer to.
+- Has zero dependencies — just pure Python.
+>>>>>>> f3187f75a952d766e7b76d18709e01138fed42d9
 
 ## 📦 Installation
 ```