0.17.2

README.md

@@ -2,7 +2,7 @@
 
 If you can't access the Google doc, here is a [PDF](https://github.com/crnormand/gurps/raw/main/docs/Guide%20for%20GURPS%204e%20on%20Foundry%20VTT.pdf) of the latest version.
 
-# Current Release Version 0.17.1 (compatible with FoundryVTT v12.x)
+# Current Release Version 0.17.2 (compatible with FoundryVTT v12.x)
 
 With support for the [Nordlondr Ovinabokin: Bestiary and Enemies module](https://foundryvtt.com/packages/nordlond-bestiary)!
 

changelog.md

@@ -1,5 +1,9 @@
 ### [Users Guide](https://bit.ly/2JaSlQd) for GURPS 4e Game Aid for Foundry VTT
 
+Release 0.17.2  6/03/2024
+
+- Fix merge issue
+
 Release 0.17.1  6/03/2024
 
 - Fix version number issue

system.json

@@ -2,11 +2,7 @@
   "id": "gurps",
   "title": "GURPS 4e Game Aid (Unofficial)",
   "description": "A game aid to help play GURPS 4e for Foundry VTT",
-<<<<<<< HEAD
-  "version": "0.17.1",
-=======
-  "version": "0.17.0",
->>>>>>> c3ecb384d30dba2e99075ddb2c447da075fc6948
+  "version": "0.17.2",
   "authors": [
     {
       "name": "Chris Normand",
@@ -79,7 +75,7 @@
   "secondaryTokenAttribute": "FP",
   "url": "https://github.com/crnormand/gurps",
   "manifest": "https://raw.githubusercontent.com/crnormand/gurps/release/system.json",
-  "download": "https://github.com/crnormand/gurps/archive/0.17.1.zip",
+  "download": "https://github.com/crnormand/gurps/archive/0.17.2.zip",
   "socket": true,
   "license": "LICENSE.txt"
 }