Merge branch 'master' into main

Author: BasudevBharatBhushan

.github/workflows/workflow.yml

@@ -3,7 +3,7 @@ name: Upload Python Package
 on:
   push:
     branches:
-      - master
+      - main
 
 permissions:
   contents: write
@@ -15,7 +15,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout master branch
+      - name: Checkout main branch
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -47,12 +47,3 @@ jobs:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
         run: twine upload dist/*
-
-      - name: Raise PR from master to main
-        uses: peter-evans/create-pull-request@v5
-        with:
-          base: main
-          head: master
-          title: "Release PR: master -> main"
-          body: "This PR merges the changes from the master branch into main after the release."
-          branch: pr-master-to-main

CHANGELOG.md

@@ -1,19 +1,7 @@
 
 # Changelog
 
-<<<<<<< HEAD
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-=======
-## v0.1.2 (2025-05-14)
-
-### Bug Fixes
-
-- Update readme
-  ([`abc4771`](https://github.com/mindfiredigital/python-fm-dapi-weaver/commit/abc4771319e1912b51fc02255f2936fcc8092ce9))
-
-
-## v0.1.1 (2025-05-14)
->>>>>>> 94cabfa (0.1.2)
 
 ## [Unreleased]
 
@@ -62,4 +50,4 @@ This project is licensed under the [License Name] - see the [LICENSE.md](./licen
 
 ## Customization
 
-You can customize this changelog to meet the specific needs and preferences of your project. Feel free to modify the structure, add more details, or change the formatting to better suit your project's versioning and documentation requirements.
+You can customize this changelog to meet the specific needs and preferences of your project. Feel free to modify the structure, add more details, or change the formatting to better suit your project's versioning and documentation requirements.

readme.md

@@ -13,7 +13,7 @@ A developer-friendly Python library for interacting with FileMaker Server via th
 
 ## Features
 
-- **Authentication**: Use **Basic Auth** for secure sign-in/sign-out and automatic session management
+- **Authentication**: Use **Basic Auth** for secure sign-in/sign-out and automatic session managements
 - **CRUD Operations**: Perform **Create**, **Read**, **Update**, and **Delete** on FileMaker records.
 - **File Uploads**: Upload files to FileMaker container fields using **multipart/form-data**.
 - **Error Handling**: Includes robust error handling for API requests and responses.