Changeset 1701ba0


Ignore:
Timestamp:
10/27/21 09:12:02 (3 years ago)
Author:
beratkjufliju <kufliju@…>
Branches:
develop, master
Children:
e2e83fc
Parents:
33439a5 (diff), c2e9bd9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

resolve of merge conflict

Files:
922 added
1 edited

Legend:

Unmodified
Added
Removed

  • README.md

    r33439a5 r1701ba0  
    662. ``` cd SaveSpace ```
    773. ``` git checkout -b develop ```
     8<<<<<<< HEAD
    894.
     10=======
     114.
     12>>>>>>> c2e9bd946c4c249836b8699c48946f6079ee7a84
    9135. ``` composer install ```
    10146. ``` npm install ```
Note: See TracChangeset for help on using the changeset viewer.